gentoo auto-resync : 18:09:2022 - 23:20:40

author: V3n3RiX <venerix@koprulu.sector> 2022-09-18 23:20:40 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-09-18 23:20:40 +0100
commit: f39c6dab71f5188f95650d367ece1df4f263e474 (patch)
tree: 9c30c203b3f09174814c41e6a63aa3522c7b7610
parent: 1b295861f983d29f9bd5d5906c7ca3cee4cf1f9a (diff)
358 files changed, 1315 insertions, 6729 deletions
diff --git a/Manifest b/Manifest
index 3f690fb87797..29e56b3a5a97 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29635 BLAKE2B 66d6be21714025c0e4035c738d4c841e7a46d6ee9d34cb9e7c1f8d3f89fa3d202a89e3d5262d0957ff560a716dd126cb4242483359de6a5b5b60800585d25fa6 SHA512 f15db8cacc61a4790ccba1c675c2c7c9160c99d63aebb4659caa973447e008c38137a23c9ebd992feaf4cf5e91bc901558dd6801155582a1937fda410e809ae0
-TIMESTAMP 2022-09-18T15:39:47Z
+MANIFEST Manifest.files.gz 29605 BLAKE2B 431e3465b69cf75c704d09c3d3c2810b789b91a024c8847340d08d3bb4e2ece10ab831c999e17cdf82a67f14652594623afc8505202e978655c761c9d13d8a66 SHA512 d85e7e29b5fc8576a2cdb9d2da89155ff3ac612cd14e1cde27d6e6cd273906374af38a0981a76642c8cc037691b04663534ae1090d4ed2a1815a01acabdcfa61
+TIMESTAMP 2022-09-18T21:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnO8NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnkCNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCRIw/+OADSVAbCSM9K7NgLw+obIzG4oURcn6MRqxBAgnbJFYRKQB2NiekbbfMD
-S749GpNIMlKFYBBrxscVcDhgo8sXFBJ5u4poBMICChdAHs1mKcyIq0Rk9dOamKwN
-4ZigFfE791CZyHmBJMIKBgZefHHTFjwiJOMNV/M5Rfkt4a6fuBVgs3xI1QShuwla
-rIM0qfKhB+XzsBkaRHbOLd7DOVGsSood/+7PrsFbkv13vSPRbmlqIXeq9+wK5CZP
-Ch9caMGPdxfV/aZHzshM5V++/y1c49RmAvnR3vA4bSY0yJHD42L9EKan906AM1Vb
-/J5wbefd+if7FW2mzBCyMoqJA60TRRLquQJIJotRDaJ5XsfmaltXvdwssPI97Myy
-SiQDwO8cva7ty6YHMhrGSzZhWUBDiSjZM06E3kDxgD8WtKAm+Nloj1grsjgFKhKV
-+AO3IGeM3nVOCM2YwmI45ukaxomeuTb9YVMcBsQAlrY0eNBpmc45MzpoMdIYDnKL
-zQRxDmkJYAuquNZ7hI8nSUJaWKsON/6kys1+iOruRUY9rtJrALJfaG2Horp16W/O
-SdfzNqdR58qlDCHVwkT7KA9OafA8iyIcE6N70K4KrVGbIsvOsN3QIkbgNJ0HLn7o
-fVoYukDxTueXYReBF5OQ9iJ4EVwheHt3gTg0goIgNmdBMJEhj9M=
-=0zNu
+klDM1xAAm34FYied/UZC1axD2ti0nTOR4B0nsQ8rxXPjBatvT6b+ecaWk/PFTafA
+9YyDQvMXfm94fJBlLEbB3cYTHAa/t7nSEr7uukTW+ImRINGksfQcO4JdTPEEEgmh
+df6cLgwDHZ9WZDYUBtW1F49LQZ6DUXG2rzMcRCOSpa5/nRm36vg/kBKDzurRIpoL
+wZZUjY4ojC5bepEI0yrfYWvp8YeCCLgAdtacehHYsp4HTLHavY0p1U2szWXTl7YN
+3KCnDGIhRSTjXpLR/xYsQw5s1pSPt4AIhlwGwSYe8CRj4mGK8fEM6wJJpOq/+nTr
+Djf/62skUbuhYBTxhTAHByH5NTuRykMLE6ut1JtR2EbNPpG3dQq87QLhx+JQyZnn
+PPo2aDPUNXCvcFikU/TbcVMsATtGfvPVdr+e3j0yi7nZe7j/PAZK4W6sji/t1VOf
+MV1i3zex0b7tWYH3y9jjGO4NYiTuVfIiUb3uLe30NDjM+V7Sr9/QaWEUjKs7hw7t
+k/1l7h2MhDNHnf965EnX+8HDY9RaUAgN3KFTXiKzMMoOnPX9lZCokuXeIL4zzRT3
+AQytcgbPUxxu1rFUtwMJAtOjMJvWxBL5XFA4oSyoMadIgSO8f3zA+d4SZwXlAmp1
+9XWi/HITUnjbhAiNqWu1Zwmy6eVfTKw+gYj0EQW5AXmvlHN3EYw=
+=ATYF
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f67fa51bf75f..4ee6c8b1bc77 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d5c68c122111..cdf017f32367 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
deleted file mode 100644
index 161d1d84df19..000000000000
--- a/app-admin/logcheck/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX logcheck.cron 184 BLAKE2B 5b773a77dace97e78efa565d8edf3bd715f564721ba0097e82a3894009fa86b6faffd3018a5270e224de2aefaaf07afa76c40b507d6ddffcf5ca4fb137ac6c09 SHA512 fd0b1bc8c836b766bfbb6102012996d27e378475571167b4d4df98301793624483aca2bd51ec19a2aa367e78b062ddde67355452db8dc1d69fe84a20a2081c30
-DIST logcheck_1.3.23.tar.xz 133540 BLAKE2B 7eae2f34027c40d3efc272bc82179962d4a5ba8613e4e6218e9730a0ce3ff00af7e040c0550ac7414ae08191a36bb37ec0358de97367deab48b552782bc25c8e SHA512 635a96c3e0beaf6056e5b96b3bd69134c3330308452e3bcf8cc28cb36365f07806046bf498cbfaf5cfbc38a812eb2723ddf51a16304140e8f7091f1e6005ec4d
-EBUILD logcheck-1.3.23.ebuild 1321 BLAKE2B b0e04c8d4b2aa8cb66cc259d6ed76c21ef9b868993c41bb96367a5881f0f70791dc49e878b97728372ea816ca5159fbabe42658fb91e56cf328944ef8b4b321c SHA512 839619f5dba2dd94f85748eb6da2d59cea2286632016c93683e4f873e37967d5e5b24544001ebcf3f7fb4b6f5df452c90730a54c040a06b66056a9f72257da7c
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-admin/logcheck/files/logcheck.cron b/app-admin/logcheck/files/logcheck.cron
deleted file mode 100644
index 3b3f4fcf62bd..000000000000
--- a/app-admin/logcheck/files/logcheck.cron
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ ! -d /var/lock/logcheck ]; then
-	mkdir -p /var/lock/logcheck
-fi
-chown -R logcheck:logcheck /var/lock/logcheck
-
-su -s /bin/bash -c /usr/sbin/logcheck logcheck
diff --git a/app-admin/logcheck/logcheck-1.3.23.ebuild b/app-admin/logcheck/logcheck-1.3.23.ebuild
deleted file mode 100644
index b278d75e832a..000000000000
--- a/app-admin/logcheck/logcheck-1.3.23.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1
-
-DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="https://packages.debian.org/sid/logcheck"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-DEPEND="
-	acct-group/logcheck
-	acct-user/logcheck
-"
-
-RDEPEND="
-	${DEPEND}
-	!app-admin/logsentry
-	app-misc/lockfile-progs
-	dev-lang/perl
-	dev-perl/mime-construct
-	virtual/mailx
-"
-
-DOC_CONTENTS="
-	Please read the guide at https://wiki.gentoo.org/wiki/Logcheck
-	for installation instructions.
-"
-
-src_prepare() {
-	default
-
-	# Add /var/log/messages support, bug #531524
-	echo "/var/log/messages" >> etc/logcheck.logfiles
-}
-
-src_install() {
-	default
-
-	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
-	# the directories removed are empty.
-	rmdir "${ED}/var/lock/logcheck" || die
-	rmdir "${ED}/var/lock" || die
-
-	keepdir /var/lib/logcheck
-
-	dodoc docs/README.*
-	doman docs/logtail.8 docs/logtail2.8
-
-	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}"/logcheck.cron
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/logcheck/metadata.xml b/app-admin/logcheck/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/app-admin/logcheck/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 122a8edb495f..ef858097beae 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index dfb7db2a15c8..a6ae583f8c5d 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -3,5 +3,5 @@ DIST buildah-1.27.0.tar.gz 14821814 BLAKE2B e9d1ffc05024c3ae520e6436372a9eb59211
 DIST buildah-1.27.1.tar.gz 14825932 BLAKE2B bf290eeb4d96d255c7cdaa07af49eff44191664ac7dee255c7979656383daaa93c3673ba82ac1cbff033de769ffa08ad027f5d91c81b08a36222cb73e8a1e399 SHA512 a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a
 EBUILD buildah-1.25.1.ebuild 1196 BLAKE2B 3f0e2e2cb09af594cac29666ef4c9b1f3b7721659f6fff2ff29fa9ebc30f841cb2703d5fd3ce41b4dcc32a30841372ae3b3d36af791423bca05c4f70f2ce655a SHA512 ec2aa76c2ba6676d828534e2ceb7a5e12f800d44b382c35ca2bd76f24631084103ba6e94f519252d90bf4511e47ac0d341dfab3c2f5206781096e87203d51fe7
 EBUILD buildah-1.27.0.ebuild 1198 BLAKE2B 62ef809576a3b390e336f845596f2a22edccbfe6ae72ad24aee52e8d8de78ec8364e72c42656adf0de189b1d0ecaf3bca88e10a88491459f6a766ca34d7687cf SHA512 3fdaaa6cd1bd0a82b4c74300536a3210c56d0c896f2a1f9e50644ea46e9ff38351b560c2295ff2fd79221b9543834f1b20e3a709fea79502078ca7b233664947
-EBUILD buildah-1.27.1.ebuild 1198 BLAKE2B 92b2bf7f5853e8ead37ed3701db43e6a0f3b1639dc86325a0b741c9dd4b2710f923530a6058f65910d6cd7fb92b75b9863f54369b6a118edc3da9616230a972b SHA512 9e0c594e2773bc10290b8d1c43995a8239025f2d9f387ae9678937cf4afb3c17f312e2b20c13bf46ce1c0940cc86db17c0720d744113f15b5ff687078e3d8e70
+EBUILD buildah-1.27.1.ebuild 1197 BLAKE2B 776bdbd022d1e567266c1b351ef890e1c26d3c6627f39f3ec33dc377ac2b6a1316cd18ac739a4aa98c3528c423b0822567ec1b762b2aa33afe8812a7b5e9112f SHA512 1a2b54a049c8135b5f3c8ba12fe428003429f9e4cd0b840d46187a2878c53d2a49d9772b49c201736e9c031073e66184c687b2dc1d4c4ddcc5c83e1faf759092
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-containers/buildah/buildah-1.27.1.ebuild b/app-containers/buildah/buildah-1.27.1.ebuild
index b5ca1d9fc5de..bffa6ea8fe1f 100644
--- a/app-containers/buildah/buildah-1.27.1.ebuild
+++ b/app-containers/buildah/buildah-1.27.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"
 IUSE="selinux"
 
 RDEPEND="app-crypt/gpgme:=
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index f096f0561123..4f427e83a052 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,7 +1,5 @@
 AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1f09585284c5b7930c185d5cd0ef6c2f7de5db2a6af80355518628a050c1cb0639ccf3b53c6c338da SHA512 1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
-DIST cri-o-1.24.1.tar.gz 15943809 BLAKE2B 13840967b7555e680652cdfe71e358fee5afcfbdbc28771960a5e28c88d6242909a595212559b7967c05cfc7cf9921d6d227b810a26bdc66cb75ffed917bcb23 SHA512 899efb61c70be3a0e950dc239245e1a4dca66e2130d8b355a7ad73c1e91088a2d42c6a4cc05f879cc6a1252d40294e9a8845fd2b110148a05a9d63f61077c498
 DIST cri-o-1.25.0.tar.gz 27673668 BLAKE2B 5231f1b00781233ddf82827a580100055fefb97e768d871a845506ee28ebc122f20f6c8dff64b9dd8d991ed6ed761a72e96d607354f7e8d4182daff36ef3c253 SHA512 783c2f019ef65079dbb838e58acde5a24bda282ba8298d7b95491356e46fc208a14bcc4c65e3183001f0fb275d8ec5d7b5c795300e6424096f84fb9130721cba
-EBUILD cri-o-1.24.1.ebuild 2722 BLAKE2B 9533ffcd06f6ffe7a66e379f6a240f68ba87dd387a785f2e51e513795c0823148f0ba6e20b95dea22bed160df6ed04259c3bd32f632f3d6b5a44b1fde30b8345 SHA512 11ab7eb74a3c32c6b0ae2ba94b5c082d1079a20fecd47574948aa8c2ad9fa6b5976e8b2de06250090ee0e2d578fe7807956066e5796be1703b736dcc81d048ca
 EBUILD cri-o-1.25.0.ebuild 2722 BLAKE2B a82323f0abbb66eec87d490128f12ee02e61e818232c5fa3965c5e1d9c20998834d4fd94bca80c435371a34bff2d2c69fde844302bf4ac038cf8bf39a01b5e3e SHA512 e7a3684fd2d1f2396722e8dc89380b575f4f53d70c2194f4d300b24b8601ef6d2b59caa1b3b87b5f5c83e87c6520a938715c07b773ee428eb329e15a91bf18b4
 MISC metadata.xml 908 BLAKE2B ff6e1663f563dff74dbdeeb5d5c778a70fe2395ff0c0836e31b538f0009215a74946384a1429f2cf8e65bccc26d4b357233f1aab1a2c70ca3f544653d79cf999 SHA512 0fe5ad9f9f1c3b7386f361febbedddb690fcf83145f80da05d77be72bf04f84d9106d46ff6962ed6cc99d7b12f3792263eb7b1711763a2cd2f8a7dac08ed5c09
diff --git a/app-containers/cri-o/cri-o-1.24.1.ebuild b/app-containers/cri-o/cri-o-1.24.1.ebuild
deleted file mode 100644
index b92849f49f50..000000000000
--- a/app-containers/cri-o/cri-o-1.24.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT=a3bbde8a77c323aa6a485da9a9046299155c6016
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/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="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-containers/conmon
-	app-containers/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	app-containers/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-containers/podman-1.3.2-r1"
-
-src_prepare() {
-	default
-
-	sed -e '/^export GOPROXY=/d' \
-		-e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	emake all \
-		GOBIN="${S}/bin" \
-		GO_BUILD="go build ${GOFLAGS}" \
-		GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
-	emake install install.config install.systemd \
-		DESTDIR="${D}" \
-		GO_MD2MAN="$(which go-md2man)" \
-		PREFIX="${D}${EPREFIX}/usr"
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conf
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 80e5669bbe32..346adbaec4f3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 73a9cfa1cc6e..4c2f76ee642a 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,9 +1,11 @@
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
+AUX carbon-c-relay.initd-r2 1805 BLAKE2B 4e45257b74319b06e3e4092d803ea967436dfedd3da10406dc398e9fe2a2fbd1cdc2020e47d1864209ed16adb8b4bfb77eabe41b304d9cc262da528e95935fbb SHA512 0842fa097c7a441907210b30ed1a75b9137d41f4c885f273d5d3b2eedd2403bb55bd7c443be10f8a4f3645d19ae1c466404a7b30c06d09810f7895fa64bb23f7
 DIST carbon-c-relay-3.7.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
 DIST carbon-c-relay-3.7.3.tar.gz 575680 BLAKE2B d2d07c7f1ec356a16bb375bd740ffa018a0d256ef1ce97ae0555001411a05e28173c2009f3980b0d711977068392b5a0baca68f9dda3a677c7c3d245cad70a0e SHA512 ba3e4b7173abe5e3b018413a8d46d91c3f433e785dcf3d7643836b91f9a6ff993b22c3db51192476c75d45486d1e2541ad73056671b4bdbfd1447dcfc3f26ff3
 DIST carbon-c-relay-3.7.4.tar.gz 584098 BLAKE2B 27fe6d7b785129aa6edd81e0a92880eee3530249900662e63f1ad7a9c1b4c8f9ff98635989311de964e4c42d4bb98f3ce1956ed170b8eceeea558ec3c191f45e SHA512 a9bcaa699e071e57e0a9092b97d1ead6781af4e00ef19f289a986c5baf56dec2c747961dfc2622285de034c17ce7ed2f5a7c856d617b26488dbdea58c4d72754
 EBUILD carbon-c-relay-3.7.2-r1.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
 EBUILD carbon-c-relay-3.7.3.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
+EBUILD carbon-c-relay-3.7.4-r1.ebuild 1574 BLAKE2B d262ce31744c36c7c290e7ea6af90e23623800f1138560997eb17c2b44ef00c926765cdb658545a556b0a974cfbf4190dd98d63a2de1267685eb1a543faf8129 SHA512 eac70773fdf5764b54026be4ff0cee01e8e968eadecf05b95a982547977651f8ca70c68a5906004d7bb8d67e2c7d129de7b283e5a26e8cf43910fc6007e6fe34
 EBUILD carbon-c-relay-3.7.4.ebuild 1574 BLAKE2B b7329b23b4811211ca680ea46d4214a1426953531606042dfcfa81b0d24c9ddaa042de895909f2120f5f41464011c155ca5215220c063615d9a9045f4f64b730 SHA512 8897e50aaed1b72b4b5f8eaf0f0c53dcafbce81fecd3c6a3e642f225a6d1643b33f2578b2c9a5c3b7bae93e974001bb4d81766c37c6007447ecdb48e87aa3b9c
 MISC metadata.xml 654 BLAKE2B 9cf6ce108100d80ba05644a782876997280ae4523b07366b3a88942fad4392fed358b134e8f33597fdc98540698531e3e7b0155e63194b4030de227f4a4c75e1 SHA512 954f00ed3ccde9cc651e9de24bcc2339deca58b2cc27f923801862fdc5298771ce5c0e729fa03c2d4d5b03624dbcbd3a17295b7e4e31fbb57221da861747d545
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
new file mode 100644
index 000000000000..d34fed5a74de
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+	pcre2?     ( !oniguruma )
+	oniguruma? ( !pcre2 )
+"
+RDEPEND="lz4? ( app-arch/lz4 )
+	snappy? ( app-arch/snappy )
+	zlib? ( app-arch/gzip )
+	ssl? ( dev-libs/openssl:0= )
+	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+	pcre2? ( dev-libs/libpcre2 )
+	oniguruma? ( dev-libs/oniguruma )
+	acct-group/carbon
+	acct-user/carbon"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local pcrecfg
+	if use !pcre2 && use !oniguruma ; then
+		pcrecfg=$(use_with pcre)
+	else
+		pcrecfg="--without-pcre"
+	fi
+
+	econf $(use_with lz4) $(use_with snappy) \
+		$(use_with ssl) $(use_with zlib gzip) \
+		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+}
+
+src_install() {
+	default
+
+	# rename too generic name
+	mv "${ED}"/usr/bin/{relay,${PN}} || die
+
+	# remove libfaketime, necessary for testing only
+	rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+
+	dodoc ChangeLog.md
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2
new file mode 100644
index 000000000000..fa0781dcddc8
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2
@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description="Lightweight graphite metrics router and aggregator."
+description_configtest="Run carbon-c-relay's internal config check."
+description_reload="Reload the carbon-c-relay configuration without losing connections."
+
+routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
+
+command="/usr/bin/carbon-c-relay"
+command_args="-f ${routes_config} ${EXTRA_OPTS}"
+pidfile="/run/carbon-c-relay/${SVCNAME}.pid"
+logfile=${LOGFILE:-/var/log/${SVCNAME}.log}
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+	need net
+	use dns
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+	touch "${logfile}"
+	mkdir -p "${pidfile%/*}"
+	chown ${user}:${group} "${logfile}" "${pidfile%/*}"
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_post() {
+	rm -f "${pidfile}"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${pidfile}" \
+		--user ${user} --group ${group} \
+		--exec ${command} -- -D -P "${pidfile}" -l "${logfile}" \
+		${command_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	# migration path
+	local pfile=${pidfile}
+	[ -e /run/carbon-c-relay.pid ] && pfile="/run/carbon-c-relay.pid"
+	start-stop-daemon --stop --exec ${command} --pidfile "${pfile}"
+	eend $?
+}
+
+reload() {
+	configtest || return 1
+	ebegin "Refreshing ${SVCNAME}'s configuration"
+	kill -HUP $(cat "${pidfile}") >/dev/null 2>&1
+	eend $? "Failed to reload ${SVCNAME}"
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME}'s configuration"
+	${command} -f "${routes_config}" -t < /dev/null > /dev/null
+	eend $? "failed, please correct errors above"
+}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 9211aa931f9a..c5dab04d4e5c 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,13 +1,5 @@
-AUX tmuxp-1.6.4-tests.patch 689 BLAKE2B b3c52055186d41be30378d9960099a705c0f7f4606c16a5aaa62f3e2df55b5ceec7feb77329715d13b7aa9fadad9424ed55dfaccb7c24bd6550be40ea6faa425 SHA512 d5ab3b391fe9c4b0646cbecbe3c3f4633829d6f1544503e96ad7d9b2265736c3082c959988344146a6623f125eac339f2f6875ec7b121e5c7db256089324cef8
 AUX tmuxp-1.7.2-tests.patch 475 BLAKE2B 07d6def54c025b6b1d538813258ba06cf9b030ac8e40160492490f31d37c07e5158a95b5b1a28a3350aab1b1bb188b29a2c12b8521ac3a12f937ceb623e04707 SHA512 1842005a34e7b4a495e9e735243d1681158cb8e24b37006edcd7c1929df1eefc2a2f174f6eefd08866f1b830951610d881c654063ce20217fb8e457a84baa7fb
 AUX tmuxp-1.9.2-tests.patch 564 BLAKE2B f164bcd3bd5344e39fe050bc3c716dc3678584071990ed19c6cdcc0ab816852d0b18f89d358ba0607260dec0eb87596e245dc386a7afb0884461d44e22dec35f SHA512 f15745bfeb8c72dc0d4a1e1cac489acaa31a18282aa8d39e5b142d207f92cbbf110e1752449f14eb2b4fabcaf9022d7f3256956e26328a2f607edfd87ac05c47
-AUX tmuxp-1.9.4-relax-click-dep.patch 305 BLAKE2B f15674bb3b007321dda444b747cfca5f5da13b4d3e5ff741aa7559271c804cf5939d511792259dd0cdd62864e08d12ebc6acc0ba2836f9d8ecc50e93f3546db4 SHA512 cb476d64cb95f94b41536ec6fb5c1954cb6e168836c1d6b40cba407d4cb0753174d6e437e71d1aba51d084004377e048e129f84caa03df671022995c4a1349ec
-DIST tmuxp-1.11.1.tar.gz 830701 BLAKE2B 37f23abf16ef78b27f04e6af9c95990d39173e62fb4ab2c898fb45075242ee2761e0c69b8f391cb59d4fd2ccee8d157650718450814ebd06716c54afd0e59338 SHA512 23cf70cffa86e8478f39661951ca468b09a8caa3e7c8a9114011a5a5440fa817c3425b38cbf00b9b7966ac1449094d101f74a450e77c153e9a1d9ca73c49e856
-DIST tmuxp-1.12.1.tar.gz 839714 BLAKE2B 98ecb807c1bb1d6cea05e997001866c29a0b4e43b79ffbae945093ed8a2487563b1d1a884fce8f8fa9ff202f602369774677ef760ab0e03881c66bc7390b16a8 SHA512 2b7f98d6e003964fbe6ed873d251fd120da50fd54f48521a0c5cbc441cb2b3031ecc963c273824ac3541783989ece4fab329a89bf29a8e9572825fcdfb541dc1
 DIST tmuxp-1.13.0.tar.gz 833657 BLAKE2B 5938121b2951b735e52eb7361a83dace4327b120ea7bb8217a5e4c32488e8cd93074b8993068b1d5d87d79df16c2f1e3d254d010b5c2836f435ed887349a010f SHA512 21a5a9fb21e30d5022d6aa6257dd9eb2977574e16e9b8ea0a3af8af4d55f69d4f6a3730ca9fc5e9a4e0b6194922d73717154cc55b808e71714570326cc7f27a9
-DIST tmuxp-1.9.4.tar.gz 821650 BLAKE2B 34454919e811bc4901dcb570046b45d481934ab36f9b8f50753972fe6545ca9e487b2f04ee818c4b54eea01181c62efb1f5262ab033f2fc92c3cee3828d16bf4 SHA512 ecf113011231a03998b3be2d146f7e6c6cc2ccfc36af59b88d51e09726259c92dc4360bde569fba13ca8d81eb9639f85b45cd5f4b50d70d347e3237e396ea446
-EBUILD tmuxp-1.11.1.ebuild 1013 BLAKE2B 5ac12b621d4f1821c584465812ed9bc8de91168702cc4b831e7dd45e24a8a887a246c747e27a7cdc7ae3fb06da53bf0693b3c04d802edca3032a8fe54ad47a2a SHA512 c8b7424ee32b259c12c8e19f5e4da0b8f7feb44a83707331d8935796c8a872c90012b3cd153c88e0dff542af54e23f9510baaddb2231441b175ef980e0146b69
-EBUILD tmuxp-1.12.1.ebuild 1013 BLAKE2B 03da38be3654cd6cd4fd3e68a945f604d491f859f4b559e4eff8ecfa8a8d2a4077b1016b39b5f2128d5a177c06a3e3f710e6eb6cdde7b16d394a2b42bd16d242 SHA512 a07afa1fb7899184079c38ab8ffd6b67ef74ec47741a5487b1ccb815f8ba3a6d97199b4082add5561f200e9915b2035e3b9d23a97f5d96d6a814b09f95f38d11
-EBUILD tmuxp-1.13.0.ebuild 1006 BLAKE2B a73d6013e96f7bfdf540d88040fdc2cf4aea73681d20d4c64e2161febbee22a9bc4e74de5dc8a5515f9ef8798273bb00f29a5fefd5f44847395ba121b1d39f1b SHA512 da755b805172238323d172ec76bcf5178ea895c8ecee2553f04b47cdff900fe1af10ce57150a9644eb8885256bb72460829c62f220196ef17f67f4ffca300f0f
-EBUILD tmuxp-1.9.4.ebuild 1028 BLAKE2B 3b7b6711c437b617ba12d41756fff7b5dfd239d1db0b9043785b65d45f31c78d73fa4c1d63e6ccc72c88904711c69fd674ee2e5a2066c42a90a90b0bb381f2ab SHA512 4a8125d4702bd42220db1e7abd1300ecf053d1f847468051e06ad0934c27b52bda2cff4f55ab7afa69cde11c0f680d07e64dc98f25c398c2ee6c948863707bdc
+EBUILD tmuxp-1.13.0.ebuild 1004 BLAKE2B 117193b813735527156d70a0047b08fc5e41bfc8acc8782fbd7bc0932a2194c084e8b00cff233c8cdf0df7755aa3ee5451c236d04c0e357fb1b741580bd5f793 SHA512 058dce47281254ecbd769e2ff18587622c47286d81e75ad299e12c62f301d6c4cf94d2952dda0640be17c3ac9989eb7800af8d225073de792b7778da95d26783
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch b/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch
deleted file mode 100644
index 4bdfe015474a..000000000000
--- a/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index 1e14e51..6945c2b 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -486,7 +486,7 @@ session_name: hello
-                 '{SESSION_NAME}',
-                 '{WINDOW_NAME}',
-                 '-c',
--                'print(pane.id)',
-+                'print(getattr(pane, "id", "{PANE_ID}"))',
-             ],
-             [],
-             {},
-@@ -496,7 +496,7 @@ session_name: hello
-             [
-                 '-L{SOCKET_NAME}',
-                 '-c',
--                'print(pane.id)',
-+                'print(getattr(pane, "id", "{PANE_ID}"))',
-             ],
-             [],
-             {'TMUX_PANE': '{PANE_ID}'},
diff --git a/app-misc/tmuxp/files/tmuxp-1.9.4-relax-click-dep.patch b/app-misc/tmuxp/files/tmuxp-1.9.4-relax-click-dep.patch
deleted file mode 100644
index a4450e37c11e..000000000000
--- a/app-misc/tmuxp/files/tmuxp-1.9.4-relax-click-dep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 228a1ae..e24f106 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -49,7 +49,7 @@ tmuxp = 'tmuxp:cli.cli'
- 
- [tool.poetry.dependencies]
- python = "^3.7"
--click = ">7,<8.1"
-+click = ">7.0"
- kaptan = ">=0.5.10"
- libtmux = "~0.10.3"
- colorama = ">=0.3.9"
diff --git a/app-misc/tmuxp/tmuxp-1.11.1.ebuild b/app-misc/tmuxp/tmuxp-1.11.1.ebuild
deleted file mode 100644
index cad088ac77ef..000000000000
--- a/app-misc/tmuxp/tmuxp-1.11.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	~dev-python/libtmux-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}
diff --git a/app-misc/tmuxp/tmuxp-1.12.1.ebuild b/app-misc/tmuxp/tmuxp-1.12.1.ebuild
deleted file mode 100644
index e4488877fe08..000000000000
--- a/app-misc/tmuxp/tmuxp-1.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	~dev-python/libtmux-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}
diff --git a/app-misc/tmuxp/tmuxp-1.13.0.ebuild b/app-misc/tmuxp/tmuxp-1.13.0.ebuild
index 688f6ab2ea69..0c48179e4fe1 100644
--- a/app-misc/tmuxp/tmuxp-1.13.0.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/app-misc/tmuxp/tmuxp-1.9.4.ebuild b/app-misc/tmuxp/tmuxp-1.9.4.ebuild
deleted file mode 100644
index ad7df0ede1e0..000000000000
--- a/app-misc/tmuxp/tmuxp-1.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	~dev-python/libtmux-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.9.4-relax-click-dep.patch"
-	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1e2141a04a20..53e79250d137 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index f236c99d1839..6addeab28d47 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,5 +1,5 @@
 DIST paperwork-backend-2.1.0.tar.gz 1352553 BLAKE2B 84bf9f34be50c2cd762c1afb496e4625bed50018242e94925ad4d5428228fadc9ac8d3866f8fbb9f0a78d049599048db62c6d7201852638cc5ad0674ebc791f0 SHA512 72cf3176091d899433a50d8a166a2505f0be9e5917df311a6f5139af472363df427102dcde99e6097b11f6aa26571bdaba06047fafd2365b4dedec0d3a47da7a
 DIST paperwork-backend-2.1.1.tar.gz 1383107 BLAKE2B 0e814a829581fe6322cc0ae44e9e3a20a2fc066e9be5de038c4d08b9d85218961ca87777271ebc646b03425e78017109ddf35c05a4b11e8fcc3bb4b6d10a6273 SHA512 ab75aaf01571eaa52a283ac6e1b9ff080d09e2514e1efb98bc96e9986acf85ec2ab2d94fc27ba15230370c642e39fddf6e11922a3d18b16af38f4281ff9c628f
-EBUILD paperwork-backend-2.1.0.ebuild 966 BLAKE2B efb007d0b4b88d7db2699fe01a2ffe41271abc6bb2f6e5c098f2036bf81ac56a6690f324670ddb4bdfa76ed81fa2488e070bb220fd2339da098f14910e4369ce SHA512 c3ba9143f84d87e93dd293de8b762cae8a1e64e416a170d3ec28a487756c5b4449eb638157189c3562d8a759aa5c190d07beebc93715f796352921f737c81073
-EBUILD paperwork-backend-2.1.1.ebuild 998 BLAKE2B 6b30dda7973451d1ef673474dfbec1e4b0a3481f1e79312109757d5e73dab99b772183c404f8055fb8bbc3520b39a3739e79813ee139257fd1c334fee0035b5f SHA512 164d7032faad526549f3a818f356e6ac3095b2699b9368a3e2802058c400ed9049b9c775957db62e5cdbec5869284cffb45e10233087830ad16c39b2554d0a09
+EBUILD paperwork-backend-2.1.0.ebuild 959 BLAKE2B b46571e2a34860e07c796aed27ba420ecedcf7dbcf908fb969b51544acf3cef45c96b54c96de717d8adc843413d7677c58b4ebf5a2c28f4712194f5230718c10 SHA512 1ef2da67bc7e325ffc22b216f01f78dd561fe7de4c1a43d6b7b48ca92683fcac55a91cff3d3be5ec1833f9ccf58996ee42567760c0d51514fd3cbd9e0dd719b7
+EBUILD paperwork-backend-2.1.1.ebuild 991 BLAKE2B ffcd34b4d13a58423a09a3d0bb9cfa54b461d9b8c19056a6a1853dd7ad3e6fb630ebc1f81ea017ee2385d0a95768dcff32ee44bcf7081044594a3e28237a0297 SHA512 bf4275a578eae3f93975022e5f84e46516bd508b33ca361b03ca4dcab27a234fc88ac274ec2d711d5b93548eef2d6b3f73f46f7de7ef80bd1eaf5fa88699ea22
 MISC metadata.xml 343 BLAKE2B c205d91c4a58119baa58d40a20915a1cbf44ee65b05d2e42150b45010c0802512008c53c487b1622f6370c46f741082347ec6241290ff1ec93142ad8fb4a9081 SHA512 e0b32b862f07314143878a643d0c8475b1d17ccf7eaddeb9cf77a787e68ebd231ccb4176c71a65ac47eefa97af2a04fedce0cb4efda24c08452c63d390a4dd8f
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
index b20acac9dac9..4f0cf6cbd94d 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,7 @@ IUSE=""
 
 RDEPEND="app-text/poppler[introspection]
 	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/Levenshtein[${PYTHON_USEDEP}]
 	dev-python/natsort[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
@@ -25,7 +26,6 @@ RDEPEND="app-text/poppler[introspection]
 	dev-python/pycountry[${PYTHON_USEDEP}]
 	dev-python/pyenchant[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 	dev-python/whoosh[${PYTHON_USEDEP}]
 	sci-libs/scikit-learn[${PYTHON_USEDEP}]"
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
index 820e83331f39..f5bcf8a9e058 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
@@ -18,6 +18,7 @@ IUSE=""
 
 RDEPEND="app-text/poppler[introspection]
 	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/Levenshtein[${PYTHON_USEDEP}]
 	dev-python/natsort[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
@@ -25,7 +26,6 @@ RDEPEND="app-text/poppler[introspection]
 	dev-python/pycountry[${PYTHON_USEDEP}]
 	dev-python/pyenchant[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 	dev-python/whoosh[${PYTHON_USEDEP}]
 	sci-libs/scikit-learn[${PYTHON_USEDEP}]"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 445d351232af..310b0d60682d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index de897b72844b..e9cbf9cd178d 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -1,12 +1,7 @@
 AUX gentoo.config-0.9.8 4125 BLAKE2B f1fbef2b61df1ac9d0ea5d36e5ced1c40ed098a221db6b975edd22585f787dd22e708b2b89bbb4bfab81be3b0234d4daceda1726ee27195a7aac1ba461f4dff2 SHA512 83259e0e3689bfb80de403379ff942b488a8d716e841ca22dfe47aeefeaf8dfab8e06a32af3c5e392def723acf50ea659f62ee16ba7dd81ca54ea79b9e474f07
 AUX gentoo.config-1.0.2 5155 BLAKE2B 4f123e68296e3c46ad9d5fc16876a108a499c0e62e919db236d905ab20a2f75ddc6427dc19591e894657e1a3a6567450bcd0357604b90ebc08a31f1179cd8ec6 SHA512 b185379e1be74237bb74f05938c5851e1fb26304e377cd1d0b138fedcc6dfc937b56da251c90996b08a6771d030346c846d3c308dc656bdcc50b78de3536fcd4
-AUX openssl-0.9.8e-bsd-sparc64.patch 1484 BLAKE2B 6cfba6ee4fa849e6d7799fbe749abf3763f22df3d5698b9120e89f0a74912462e7b14e457040071c2b46432210e9827ccc4e399eda54a5375b0f045d7e0b67ef SHA512 dbbfae5ce19a4247a6b1ca4a45ca6c15904e13e6bf603447cb5d9820292ceb411792e29db0001c5869e3c4cb0a8afe7fb64d35f007052efc68098301c2e81def
-AUX openssl-0.9.8h-ldflags.patch 1151 BLAKE2B b215e46c380e571f153445f902803cf5d03d44f6f8b95a677c08bdf542e6d199c58f1f4699eb7dbd9de8bdc02b697a7971a9a06157d96c3dbd4295090a778723 SHA512 7f98c5ad310710aeceefd6fac440682bf2baaf41ce17de535add54af88c45fa0689e6e6c26bafb4fe2290fd3b6d80c51d85ffda1e276a73a3d66a319585aab11
-AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2a8e4a8b647bbec009a829ae4af8afdc7e7edac7a1eec8f13af1ad69b7036ca6af28bfd9509e6bba58f2b3906d6bdd5 SHA512 5e8a20111bd4809e7375c7323dab2c2edd6a131d1ec2377ee99c5e06ceb7b4b000e9606ba6d0e68cd67d8e001cc8194e11e301eace0feb066d5f3c5b331b5f04
-AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a
-DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
@@ -14,7 +9,6 @@ DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab
 DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
 DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
-EBUILD openssl-compat-0.9.8z_p8-r2.ebuild 4983 BLAKE2B d1d4e37b0b7f0226cc5c76894c28e14319882948621f9afb55979c3714894bf0bdbb4cabce3eb7b9070f353714c93fdbdfbd7fa4a368c9f50d49cc941c4d79df SHA512 85535f889a0fd5cd0d623beaa9b9b1df9efc6147e15e381985b5fd394614d5a52b350675f124425f2ae94b73f8303a0877bb26b2e09b998349b5fb5a942abb7b
 EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
 EBUILD openssl-compat-1.1.1o.ebuild 7828 BLAKE2B 5f374aadbd173b82e7b2a1fd1de1f166e8f46887d96bcb889eb7baf8e3621e6dc4ac5998b4540bd2958cdecb38d827f3039da535be526d947dfbe00ddd08c413 SHA512 0ba38b74bca90d5a6848894bbe163b7d9f5019ea096f7bb02206ce91616bc6753c493be6546b592cdf49fccb535f964f1cc8c8a312b801db0fec09c36b9ea7a6
 MISC metadata.xml 1223 BLAKE2B db6fe704a4a09590821cd011556759cfd60543fd531fef3bd233378f396ac5e67c7d834eee4e544995c3af02dc9f222ac787e0b8a1c48a6cadd06541c81372fb SHA512 3cd0b3d8ba2c2c31d3240a080c0edf61a3b090adb4bb14c3b79c9cd1f0c0ac332a9c9457b218a09fb9192cc82004dba57cd4cac404fdd5ddfe4f0c7780b596cd
diff --git a/dev-libs/openssl-compat/files/openssl-0.9.8e-bsd-sparc64.patch b/dev-libs/openssl-compat/files/openssl-0.9.8e-bsd-sparc64.patch
deleted file mode 100644
index a798164a9069..000000000000
--- a/dev-libs/openssl-compat/files/openssl-0.9.8e-bsd-sparc64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Configure
-+++ b/Configure
-@@ -365,7 +365,7 @@
- # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
- # simply *happens* to work around a compiler bug in gcc 3.3.3,
- # triggered by RIPEMD160 code.
--"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:ULTRASPARC::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
-
-the -B flag is a no-op nowadays
-
---- a/crypto/des/Makefile
-+++ b/crypto/des/Makefile
-@@ -62,7 +62,7 @@
- 	$(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
- 
- des_enc-sparc.S:	asm/des_enc.m4
--	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
-+	m4 asm/des_enc.m4 > des_enc-sparc.S
- 
- # ELF
- dx86-elf.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
diff --git a/dev-libs/openssl-compat/files/openssl-0.9.8h-ldflags.patch b/dev-libs/openssl-compat/files/openssl-0.9.8h-ldflags.patch
deleted file mode 100644
index 64cc7bde0504..000000000000
--- a/dev-libs/openssl-compat/files/openssl-0.9.8h-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/181438
-http://bugs.gentoo.org/327421
-https://rt.openssl.org/Ticket/Display.html?id=3332&user=guest&pass=guest
-
-make sure we respect LDFLAGS
-
-also make sure we don't add useless -rpath flags to the system libdir
-
---- openssl-0.9.8h/Makefile.org
-+++ openssl-0.9.8h/Makefile.org
-@@ -180,6 +181,7 @@
- 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
- 		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
- 		MAKEDEPPROG='${MAKEDEPPROG}'			\
-+		LDFLAGS='${LDFLAGS}'		\
- 		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
- 		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
- 		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
---- openssl-0.9.8h/Makefile.shared
-+++ openssl-0.9.8h/Makefile.shared
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/dev-libs/openssl-compat/files/openssl-0.9.8m-binutils.patch b/dev-libs/openssl-compat/files/openssl-0.9.8m-binutils.patch
deleted file mode 100644
index 9fa79b9a65fb..000000000000
--- a/dev-libs/openssl-compat/files/openssl-0.9.8m-binutils.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/289130
-
-Ripped from Fedora
-
---- openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl.binutils	2009-11-12 15:17:29.000000000 +0100
-+++ openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl	2009-11-12 17:24:18.000000000 +0100
-@@ -150,7 +150,7 @@ ___
- sub BODY_20_39 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
--my $K=($i<40)?0x6ed9eba1:0xca62c1d6;
-+my $K=($i<40)?0x6ed9eba1:-0x359d3e2a;
- $code.=<<___ if ($i<79);
- 	lea	$K($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
-@@ -187,7 +187,7 @@ sub BODY_40_59 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
- $code.=<<___;
--	lea	0x8f1bbcdc($xi,$e),$f
-+	lea	-0x70e44324($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
- 	mov	$b,$t0
- 	mov	$b,$t1
diff --git a/dev-libs/openssl-compat/files/openssl-0.9.8z_p8-perl-5.26.patch b/dev-libs/openssl-compat/files/openssl-0.9.8z_p8-perl-5.26.patch
deleted file mode 100644
index c932b820425c..000000000000
--- a/dev-libs/openssl-compat/files/openssl-0.9.8z_p8-perl-5.26.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/639876
-
---- a/crypto/des/asm/des-586.pl
-+++ b/crypto/des/asm/des-586.pl
-@@ -4,7 +4,7 @@
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
- #
- 
--push(@INC,"perlasm","../../perlasm");
-+push(@INC,".","perlasm","../../perlasm");
- require "x86asm.pl";
- require "cbc.pl";
- require "desboth.pl";
diff --git a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild
deleted file mode 100644
index 3b77fd0b9f48..000000000000
--- a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs multilib-minimal
-
-#PLEVEL=$(printf "\\$(printf '%03o' $((${PV##*_p} + 96)))")
-PLEVEL='h' # _p8 -> tr '[1-9]' '[a-i]' -> 'h'
-MY_PV=${PV/_p*/${PLEVEL}}
-MY_P=openssl-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test tls-compression"
-RESTRICT="!bindist? ( bindist )
-	test"
-
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	!=dev-libs/openssl-0.9.8*:0
-	!dev-libs/openssl:0.9.8"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-
-# Do not install any docs
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/openssl-0.9.8e-bsd-sparc64.patch
-	"${FILESDIR}"/openssl-0.9.8h-ldflags.patch #181438
-	"${FILESDIR}"/openssl-0.9.8m-binutils.patch #289130
-	"${FILESDIR}"/openssl-0.9.8z_p8-perl-5.26.patch
-)
-
-src_prepare() {
-	default
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
-		Makefile{,.org} \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared || die
-	# update the enginedir path.
-	# punt broken config we don't care about as it fails sanity check.
-	sed -i \
-		-e '/^"debug-ben-debug-64"/d' \
-		-e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \
-		Configure || die
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags -Wa,--noexecstack
-
-	sed -i '1s,^:$,#!/usr/bin/perl,' Configure || die #141906
-	sed -i '/^"debug-bodo/d' Configure || die # 0.9.8za shipped broken
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-
-	tc-export CC AR RANLIB
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		enable-idea \
-		enable-mdc2 \
-		$(use_ssl !bindist rc5) \
-		enable-tlsext \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl tls-compression zlib) \
-		--prefix=/usr \
-		--openssldir=/etc/ssl \
-		shared threads \
-		|| die "Configure failed"
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts
-	emake -j1 depend
-	emake -j1 build_libs
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	dolib.so lib{crypto,ssl}.so.0.9.8
-}
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild b/dev-python/Levenshtein/Levenshtein-0.12.2.ebuild
index eb68abba9ce0..9a69b15794fa 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.12.2.ebuild
@@ -13,7 +13,7 @@ inherit distutils-r1
 DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
 HOMEPAGE="https://pypi.org/project/python-Levenshtein/
 	https://github.com/ztane/python-Levenshtein/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
diff --git a/dev-python/Levenshtein/Levenshtein-0.20.3.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.3.ebuild
new file mode 100644
index 000000000000..3b7310807ac8
--- /dev/null
+++ b/dev-python/Levenshtein/Levenshtein-0.20.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="
+	https://pypi.org/project/Levenshtein/
+	https://github.com/maxbachmann/Levenshtein/
+"
+SRC_URI="
+	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-cpp/rapidfuzz-cpp-1.0.4
+"
+RDEPEND="
+	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
new file mode 100644
index 000000000000..d29e50e2d606
--- /dev/null
+++ b/dev-python/Levenshtein/Manifest
@@ -0,0 +1,5 @@
+DIST Levenshtein-0.20.3.gh.tar.gz 33573 BLAKE2B 2ba0b35cd15da645dae3e18ce7d57da685cc273bb3902e645bf6a0826f212fab0b91a5765fa6b9768fd6d5cca728a3f0e384f18a90e29fed571b71e03171dccb SHA512 3adde94e7f195aaae3361296d4ec2e7694c6afb92abcde866d659a827bfdfc2ab1fb28d92332966abd7da8392590cd96415b7f593bde8375b35bbe845e9ddfe3
+DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
+EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B a56ef0d6431d51516f69a6a00dabec4681aa3e999fecfd904d34fee2dc1d4e8fca5ef47af6d388b0dcb72a9a1664f4d8ccb4124496d6ddb1306c7194aba06d1a SHA512 12021fce00cc5bb951cdfaba190a14f512bab14cef53b430504400bfa99daa91faa04a819fef750c7e558b0a99698fc52c8f52294d4ce47069efdf30a2d9600a
+EBUILD Levenshtein-0.20.3.ebuild 840 BLAKE2B b1b57cc9e5899251cf2063b49e1841e7a96a90958c47bb92272acef797566321f203847971963fbc50fb38cccb1e723c58b9e5da63b9a7b900b53e74a60b6d3a SHA512 139af1c2ff5f4bdc3523b9121bd0217d20ca9e030be87123c9892e38af028480c928cb0d35130200f422ce66c8962997fb15b4de534648ffc752b229455b020a
+MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/python-levenshtein/metadata.xml b/dev-python/Levenshtein/metadata.xml
index 414d22588236..43ccee7cbff2 100644
--- a/dev-python/python-levenshtein/metadata.xml
+++ b/dev-python/Levenshtein/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">python-Levenshtein</remote-id>
-		<remote-id type="github">ztane/python-Levenshtein</remote-id>
+		<remote-id type="pypi">Levenshtein</remote-id>
+		<remote-id type="github">maxbachmann/Levenshtein</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 08ec48ae421a..3fb8f5d47f49 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index e7a1bc2f844d..70d3559c4863 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
-EBUILD fuzzywuzzy-0.18.0.ebuild 573 BLAKE2B a3e67727f104135e05d389be0755e7fd2f4c2d6ff054425ae155b3e9cebe87e69e8285784689e9f343bd05badc4660dd3fda776824f70bccc61912bc14c34d4d SHA512 7f372854049ef05b4e1fbd31a63d1ca9040643059786a531d5575415ca829c1488daac1b689e402b8261682e63dba83cc9f88acf163f610e529fc6e00990bb1f
+EBUILD fuzzywuzzy-0.18.0.ebuild 566 BLAKE2B beedf85193e00229cf223d579128eafc48835a138caab1510db39b8bbc0fdaa0bb2255823296cb19bc38222b947bdb55438413eb6ed516ec2736aafb742ab24e SHA512 b217d5b0f3e2319d7306cafadd3a650bd2c2d2d82881c8d6e8a7693a005654c50cad6eb584c6d268aec06a722fa866868f90635783430747382dd05b68760a1a
 MISC metadata.xml 397 BLAKE2B 7d156fc2db4d42258707bbdd93f09ee48ad139d237413b3ef80e4618f614c1e1da4e4a60bfde43976e9cd8fb06bb38f15db086571b93f8eb0cd7c9e4a2d932a4 SHA512 fee9f0884d1a8b2d66e799d5f58402951be0d99c0660e4d378f31dc76fc7384f73d6600dea1270882ce23d35cb45248f123f2ecd91eaba04a63bfa0cf73c0127
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 4ccd97dca9b5..8cf3de7a61f0 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND="dev-python/python-levenshtein[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/Levenshtein[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/pycodestyle[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 14b3f720f9f2..63a47eef442c 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,13 +1,5 @@
-DIST libtmux-0.12.0.gh.tar.gz 214161 BLAKE2B 7040da2ee782b2e6bc73c70de0f5d5713c989a0959b0e731ac060f442e82e99829689f924cc2aeef6e79339b4f419df4143e2d5a9e356ad27cccb9cb3802e2f2 SHA512 f6f80daa3aaa99dd81ec0eb6a119ab1ad5fcd6c656d280b06a40c2b3bdc8d3ca7ae06089ea74482bfff005997f07e346338330d9ecf1c6745a6f3b7719b9cd0a
-DIST libtmux-0.13.0.gh.tar.gz 240339 BLAKE2B 5b975bef4835ed8b74f05fd56bd824028fa64b56c700396d0387661cdf41a4a43d81dce10462c89a90ce352b00ca0fea0334fa02e7259464a62369637b2435ce SHA512 bc5fce8c201f7c69fcbc15605808544baf19896e51c44daeebc4c133ee1db70dbffa8eea2641862cf27ca9fe341f4721cde432682e5aea84b2573f83ad25555f
 DIST libtmux-0.14.0.gh.tar.gz 241472 BLAKE2B 910005f944eefc8e7a92e476fb5d6c1693b1d1a6a82a27445487b9d16037610d6bd79301dea3c14a3be297ff8c774ba9e80f2036b6cf6259822c31ff673eaacf SHA512 726df5781a6c1a80f31035c6dda6e423e30c49d7d6e9865cfb17777a96dc36cc4a4f22f1330a87d3d1fa2f513ac34a7e1c4a51c9bd3dc1d2be79c67767061b76
 DIST libtmux-0.14.2.gh.tar.gz 234682 BLAKE2B e93b0a280c3cfdfab4c9a313d251d15665c530813f00aa78151efe62a6a566f2d8986afed015de4a8be80b48f31ac197e98d3efa592eb8895e8d9626ff34ef72 SHA512 1565529ecf555dac8f896146e2d802c0e5460458ea1da6ba5496d5d2c394f56cc8c5f7650c5d4aebd1750659bbdc529e439e60dff6a0ccef8806bb65305d2421
-DIST libtmux-v0.10.3.tar.gz 225258 BLAKE2B 40d591ee1f8a6068947b61416d6247b2475cc99031a67c167dc527631e50075f18c46fe6fc16193867d83a1a735b0a23fbfbc77f4539f788f05375f1f68b77d2 SHA512 2c8f28ce8c313404caffa42e5fd4a1dfa5d48bdc48203f8db595cb97b44886d63608771f23d62d76a56513b7e4578e48a31cacd224eca92425f110efd0a5db69
-DIST libtmux-v0.11.0.tar.gz 234278 BLAKE2B 4939d38894fd6a1492ff282c98243b2d5b3b6f787691031c74337629aed710d3caebeb3bfce571e8f38fe07ecc341b6b3f8aa0bc42979fa362f5f0679aabf21e SHA512 e09749ce4cf7cf7756e4e40e50c6eb0a00435f2b00c8436667b6b77a94078e9c380a811107f8129ea0d347355f3ce8bb213b8fb36de2becf3cf1a2dbebd97867
-EBUILD libtmux-0.10.3.ebuild 905 BLAKE2B 63b12c494a018b8ccbb0d25fe97a5c67c8ebc7b5df0cc9d92c254fa245409f4f08fb8d45875a3595b81faace65d3b37b40eaca939768f4910781625cb5ccc2e6 SHA512 ab794fc256e2a17ffbfd3e2fca12cf69f804cd1abee07ffeaab1dfbd80b189da8b3f8633dfa755d026d4c8b5ec5444aca9350ab33384d75e03d08d01a3cea198
-EBUILD libtmux-0.11.0.ebuild 893 BLAKE2B 78bc71ad81e503f26119b443e82d83b99c63d55cf07186f831cb881bce838b040158b438b94f59b833aa58e5e7eff143ef64ece236bfb7df87f71f14dc20b2ed SHA512 63c6488f01a2f4a8fec27b6ee383f5d1493ccbd7e54522a951f2d6613247009364194e381c9f0698337d7b19a20907191bce49eeae232bcd934d3a659a6f4152
-EBUILD libtmux-0.12.0.ebuild 896 BLAKE2B fff952326f8be9a0c87ec6668ab8dcbc090bcca65e1d1f07bb6155ba57c1fa55e3ab23312226bae66bb439eda537acebd29af29e71b54976ce7bc49402604d28 SHA512 5174b8e419f5c72b6e29ed676e5ac083d23cf41e57d7bc02eecc9a222842cc364c711bf408cb7f0fb66dc70c1ec6f7de833d51d0a423b08aedbb1063865aa493
-EBUILD libtmux-0.13.0.ebuild 979 BLAKE2B 992f0bab62635f4304d01ae890ea09036d2e179761617f20ab858376e1c36bcdd16da492e11ebc1ea7cace6ef844ce98fef04c8d2439252e64a9bbe4773d8714 SHA512 78c560b8aa1d948aa2ce76eecb5686abe2394317c73c73294b0fa3fc0a9f7b69da1a2193f209ac9796ff5189ba666f39e34240bad40603f1a3112809d82ebb57
 EBUILD libtmux-0.14.0.ebuild 1045 BLAKE2B 15271b0d210c5a18446c2db48a545c5011681b45f428860d4ce0f203164f48808a31de53574924dab1488119714124d12e8cc0a6272418cf960ec4c44180ce65 SHA512 b613a238fa185740af567aac8ad73753d82cd27c962d76bc3d7a5991b123dcdd42c9f64e6fcdc35a36f0e762066c839eb4e18dfb19ac5d9aa289c5eab06690d2
 EBUILD libtmux-0.14.2.ebuild 1047 BLAKE2B 8aac24bfe57ba4eb2f696bc5a58040598d9bc9dc400ce00015a355fa6d3cfcc2b7b45b07eb5d7f56c04289fd2b1699014692e28d4e7c054144812672be92a9a2 SHA512 47bf97e116a9d72d88d743f114eb4abeb1ba93bb747b0b8f4cded9840d8e279ed73c459ba32c1773ba130f2e83311d0acc5fdaa03820396ed8f6b384cdca0d6b
 MISC metadata.xml 403 BLAKE2B 68af7251349c8999bbdbfb7b55ca4632f8752468d7e478fd985097af86d00afe93b231667a25e3c997a3bc86b708d4e6d6ef5c35a783871cdc83519fc1db1ab1 SHA512 2a88df695e94f1da966bb72f7e90d00f2e343e40fe1924837f8c087dfc9a9a84fe0b2909a98f2f41ba72f6ba01796888a80cbac3f1bf9f05984a06385037d977
diff --git a/dev-python/libtmux/libtmux-0.10.3.ebuild b/dev-python/libtmux/libtmux-0.10.3.ebuild
deleted file mode 100644
index 12b09f6f2d19..000000000000
--- a/dev-python/libtmux/libtmux-0.10.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.11.0.ebuild b/dev-python/libtmux/libtmux-0.11.0.ebuild
deleted file mode 100644
index 4ec1b4d3e99f..000000000000
--- a/dev-python/libtmux/libtmux-0.11.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.12.0.ebuild b/dev-python/libtmux/libtmux-0.12.0.ebuild
deleted file mode 100644
index 38f4f726af96..000000000000
--- a/dev-python/libtmux/libtmux-0.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="
-	https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.13.0.ebuild b/dev-python/libtmux/libtmux-0.13.0.ebuild
deleted file mode 100644
index 4dce1d6a69c4..000000000000
--- a/dev-python/libtmux/libtmux-0.13.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="
-	https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	# increase timeouts for tests
-	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/linkify-it-py/Manifest b/dev-python/linkify-it-py/Manifest
new file mode 100644
index 000000000000..c90b40e5ec1a
--- /dev/null
+++ b/dev-python/linkify-it-py/Manifest
@@ -0,0 +1,3 @@
+DIST linkify-it-py-2.0.0.gh.tar.gz 76363 BLAKE2B dc04c1445b86998bd59d452cb86afdfa91d1165cbfe4148b5f9f0234b2f9f9e71fa3c41c36749e96f1269eda20fb81ed55fb63b18947e5c38bb233cdff06f9ca SHA512 7d2a66d5f0e33aece5b8d2737f20bd83f6cb2b7958b681c293f5996263f65f525862ce0cb0f7be9df1597844e58ed804b5b604c257e4d84cbf05677fd2733dda
+EBUILD linkify-it-py-2.0.0.ebuild 609 BLAKE2B b5200f38eb471fa7aab061b95219d75f30a543d6298d8f89f882973bf6835f08b0a7883651548df455ea7d02f394d5223f3ead06f8e7d6b28ff085411829dbbd SHA512 f9833c436ac844f2fd7717f94105fc9222ee2107197473137cd3c374e33d6217e898bd70bdc3bb54674123121f32065446011c8360b8bf2bdb7c1badaac3940b
+MISC metadata.xml 402 BLAKE2B f743f7ee6ccc16f6ae09861fa1712b456d7d7796afea37616781f3c40c33633a4571c78cfe41a9fb9b7e6370b8d2c03197e57ada0a0c5a2f80c1a21bbcab52cf SHA512 783959f08e822d432f30348ff5a7f4fc0713d0d273286cb840c43165141b12d28d812dce0958105561bb2a9d02e0034199d1405b4b83579de2283e133a03eef1
diff --git a/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
new file mode 100644
index 000000000000..5e3c429c5a68
--- /dev/null
+++ b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Links recognition library with full unicode support"
+HOMEPAGE="
+	https://github.com/tsutsu3/linkify-it-py/
+	https://pypi.org/project/linkify-it-py/
+"
+SRC_URI="
+	https://github.com/tsutsu3/linkify-it-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc"
+
+RDEPEND="
+	dev-python/uc-micro-py[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/linkify-it-py/metadata.xml b/dev-python/linkify-it-py/metadata.xml
new file mode 100644
index 000000000000..988228a91da1
--- /dev/null
+++ b/dev-python/linkify-it-py/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">tsutsu3/linkify-it-py</remote-id>
+		<remote-id type="pypi">linkify-it-py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index a1c7a7491f5c..62592fef02c5 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,3 +1,4 @@
 DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
 EBUILD markdown-it-py-2.1.0-r1.ebuild 940 BLAKE2B b0cedc3fad75106c214baa72beb5f1fb515740616385833aa2252e13406acaf2f8ae7601d8eaa94449608775afedd69ef062caff88826e4a3c7c72e74b2ddf73 SHA512 f5c21e569860963c03b36f4189dbc8c0081c1b6664c49349b6a48e4a4115f83b2ea7642c5b5a9bee7e494f79d6b7f4df19cd85d4050d0ffcdbe9f0509fe070f8
+EBUILD markdown-it-py-2.1.0-r2.ebuild 785 BLAKE2B 4d01422f3e7f77958ef1614aff1b2a970efbfd974a21630d267d01e74b06b08d25485dc142c48af27e2ec3d40232399650242b92b6ff09368d9e2606f496e68b SHA512 9bc41e72b23db5c99e01a1dd6415dd24d7d8059fd0f2f6d027a25c30f688d767bfbe4e4e6ecbe036cefe3f00cffd4ec6e712ecf64d8b0d655333efacebcf8da5
 MISC metadata.xml 412 BLAKE2B bffaf51dbd0a94b09d07650e49e9bee76015ab4358c36db207713d82387a1d729e7f6576d824b02ccfd786353762e623e3dd657fb3d7c42f8467c8165da61ed3 SHA512 88b86fad883100895db6feee193102cc93ead665e1283d02f9f57a4bb228acfc738cef11af2ba02cab9b02fdfe8ba35861347a19e5b0de22f546e8e0a297e173
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..d8a13cb8ebf8
--- /dev/null
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of markdown-it, Markdown parser"
+HOMEPAGE="
+	https://pypi.org/project/markdown-it-py/
+	https://github.com/executablebooks/markdown-it-py/
+"
+SRC_URI="
+	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc"
+
+RDEPEND="
+	dev-python/linkify-it-py[${PYTHON_USEDEP}]
+	dev-python/mdurl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# No need to benchmark
+	benchmarking/
+)
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 15f1d755230f..155ac1d25518 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,3 +1,5 @@
 DIST minidb-2.0.6.tar.gz 12019 BLAKE2B 00e070d1cbe1966d44228f6ad13b9280ee8d79b1b37a72d685dc53b05d329e6ee02f77a7cac729e6c4e651d66d88d1fcd7be7f704e91b3ef2dddd8c928bfed50 SHA512 17c845d5bd45a99020a96a1e1aeaf2d7663f41dc23828b4ec00e49bebb066e021d751b9a1e1ee846973306198224f91543d20219beaa40b4d245cccc4f746b93
+DIST minidb-2.0.7.tar.gz 12282 BLAKE2B 349aff4ec7497fc74edd632f719a6f67a2e7c1dff38ea1ea579c820e00dbad4e7269355e4b19ccfe53cf637f0ebdd6cd512e1af84456ef70c05d8e19024ae94d SHA512 dc04d2d51fdc4ecf30e234cb25e17bf0cd5c320dfca6bdd306b61eced89fe8f1fb5df93111ec0c04f1b258ecde467203a968e61b913feee87301dec7e93d9412
 EBUILD minidb-2.0.6.ebuild 446 BLAKE2B cde694729d3e7544e30c266d42f2b7026b51fd53b51a320546645a179c8808b040ada4f4cd715dcdd4521a639082d6fa718125977af6143e929a911d5f369085 SHA512 b5fd06e8e45d4563b8d61c1085f5868c38c471a7da7f3e57701a815f6eccfdc6e4fe952d144670ce2c44102660289337260796273a18c3ff3754217643f5d3a1
+EBUILD minidb-2.0.7.ebuild 449 BLAKE2B dedf086ef95f409221d34cd8aa4352716770c60e19f67d7db54b9ffdfdb1a3017a948c009abdee4fb2f5b14750b773ab5bbf010e1c0ce9633a81343e577a6ac0 SHA512 a21bba538850fd7f602d5f822552644343fa1e79e161a2826cd71619ffd98a31fc31e91cb690597d1ca769106e68b59d8cf1d8d387a6b5b62dfe053017f458be
 MISC metadata.xml 548 BLAKE2B 73e5840f9b81cbd36181338a9e0c68b688abb69c1a71b082b3436ec4d4f8750f77d06593e1b823243f5c86a516956e8b25db632eb318ced582bb94c0717562e1 SHA512 ecd8a69c67f4c7fd24df1a1c85a41b2f7d6ed8850e5b3c8d09bee66da55302d26f12dc73b5210634060b5da71477fa8b65d055e98572490e31ebe686d88925fc
diff --git a/dev-python/minidb/minidb-2.0.7.ebuild b/dev-python/minidb/minidb-2.0.7.ebuild
new file mode 100644
index 000000000000..0ca8234c832e
--- /dev/null
+++ b/dev-python/minidb/minidb-2.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Simple SQLite-based object store"
+HOMEPAGE="https://thp.io/2010/minidb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
deleted file mode 100644
index 3d971872bedd..000000000000
--- a/dev-python/python-levenshtein/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
-EBUILD python-levenshtein-0.12.2.ebuild 628 BLAKE2B 060e89bd437d621387049f253260d0c5e0b3dd098f12177d2ade17e7a144afc99fba2dbe768acdc93aa259947607477fb4cb03bc652ea49d29615be6de35fbba SHA512 3ae63ce98ea4fc6879647e836088c64b06551bd605578b62cef993b1189423d20375265d2248af2b5ea938ee47b1d1c3a62ab555d34609942541eb4d902ece41
-MISC metadata.xml 386 BLAKE2B 9c0dc72d1e563ec5833073032b22ee87d001bef49607c37dec69db4283ed2f7e0dc9da40dacf6e42ee6969474d3ecbe9ff6584b2e0b48f1b7d8d3bd9893dea67 SHA512 9f742e94267ca9054fb569b7a2923e00371157993d7b9da86dbe505f6a198742f564e14913ac2078fbce86d11d77d7eaa9c6e11b4f1d2f97c748f931926f0b48
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 6e96f9c1fda1..3293d3a3ae4f 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,4 +1,6 @@
+DIST snakeoil-0.10.0.tar.gz 176879 BLAKE2B 3da1da469cf8eb465458b60f41fb32594aba4c800ffc620a4f3a2d7bb5a601b1e084a889b5cb1910013a7a6f9fa4147a32961497e117533cb19ebf39a2153730 SHA512 cde0c2009b3d8032bedc35d63eb40fc2890399f9158ee4c47403e405796ca116fa553ccdafc4ddc277213a49e4303994ba5909e7068b528bde2070dd863adc56
 DIST snakeoil-0.9.12.tar.gz 265877 BLAKE2B dda01bbe16b1cd9f0d6c064f6ce165291d96217c9f722a9b32b7443f96a266278c84297d24ee46aa32ffc6b17f0f6c6f41010868c0d54ff33de8fcc404bb76a9 SHA512 8178c7e7dba2366629a3b016cc662152d70347a4167dfb425f5d659a19c17e3d478a5d4f3098e8b2b82d9effbf3e54b269e1e73c0306d537989f4ab7bda4b577
+EBUILD snakeoil-0.10.0.ebuild 750 BLAKE2B beee47d0a57a3dfc567552b8f96fe89588d5997c3078aee59a513cdd3f26afc77aca7966e52804b8a63930dddf1a23177c94c9e874142ff3a865e4f08ec4d2dc SHA512 153c8aa013eda1340cd3d9a190887e3e19d78f5e1563803c392d21c4f0eb3c2d4e4f244bbd956f388c24ced7cd4e16c6de8ea38366bbb1eb70953b46bb622fe3
 EBUILD snakeoil-0.9.12.ebuild 820 BLAKE2B 99f25344b62f708ac74ce1095ef93e72a3a01a1530d679aae81c3a54aa06a7ccc8352a7bfe67c8636e23e32ab17a6f51e9901d9d06cc8159b975066dafab3b96 SHA512 b4f47f4f2a428aad4c89fc0640869aec465e9fb8d81f0b26185d35e73f29eaac898cf3f564791ee626718a3c5d6c4aa714f8dda5b1004e859c68d2bbd1600884
-EBUILD snakeoil-9999.ebuild 828 BLAKE2B 6068e7a9dec6ecf1db9b60526434d38954ce822e6f308777cd0319e2afdc61012d0f85e88b18f1457263655e9a98c200f372f314dcfca73fe1f1ecb95fd09a7b SHA512 9f8f6253202940133db2a22687a78e1a168822cb74ff0683d76f48d2e0f95a5b13acadc70f45b6ab023d3fff699dbe4b858caabd09bce581e43ea2485472b480
+EBUILD snakeoil-9999.ebuild 750 BLAKE2B beee47d0a57a3dfc567552b8f96fe89588d5997c3078aee59a513cdd3f26afc77aca7966e52804b8a63930dddf1a23177c94c9e874142ff3a865e4f08ec4d2dc SHA512 153c8aa013eda1340cd3d9a190887e3e19d78f5e1563803c392d21c4f0eb3c2d4e4f244bbd956f388c24ced7cd4e16c6de8ea38366bbb1eb70953b46bb622fe3
 MISC metadata.xml 587 BLAKE2B 900b8c54a2f534b722e6b7bac5784911e475422dfa222b49cc3eb8dff316de2f619cfdbd93ef0093ad66d4f14c465f8ecad59b073a75a0cc7e1eb44f250fea1c SHA512 3599db4056b8d2b7807f677f43f2830eaf7f94124ec483da8a3386c3789b6526c8204f823c1a366ecfd08207195bfd26e31156759afeccb313b0d841181b0963
diff --git a/dev-python/snakeoil/snakeoil-0.10.0.ebuild b/dev-python/snakeoil/snakeoil-0.10.0.ebuild
new file mode 100644
index 000000000000..a2c4c4cf4928
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index e6a030dcee73..a2c4c4cf4928 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
@@ -26,6 +26,4 @@ RDEPEND="
 	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
 "
 
-[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
 distutils_enable_tests pytest
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 999b32d42d32..6068318780ef 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,3 +1,5 @@
 DIST tempest-31.1.0.tar.gz 1114805 BLAKE2B 29c0f55db6812a4da6bdbce1159a7e5b87ef0caf4b21e0810b6c941633182da12b72675d86ec0f9f2b844d91258439305c059f6f03ed09d45f7758426c6c096f SHA512 56726d5c0aa8d576e3dc200d30a370be08fec178f357381f00ca08883ab1ccf56fbfaa53ec9322a5f4eb5383e0572f25d8cd277848bc0c3a3d12e57722860a2b
+DIST tempest-32.0.0.tar.gz 1121245 BLAKE2B 00cd2bf7f0869f9040134076e93ebb9d7aa56504788484ed0597d024afb74726df64aa2899dc021ba977cc01814e5e2213b46428d969a73d561e0056b5777d84 SHA512 8770a7067439977720916a8221554836c29afcb18f29716dc513c2eb9f5e09d9b7e123bf98dcb70dafb889594c431efb0367187622e5f0561b24e296a3613734
 EBUILD tempest-31.1.0.ebuild 2135 BLAKE2B aed4a3c33e8c909f1b40b8d9bb5b13cd38b038b340f0d156ceb6692238f6dfa04d7f2cb69d01728e590c9a16b9312f521ae1be418a9a9d4c846d7216ac77ae17 SHA512 62d4381d73e3d8bffa6e89cf8459553424e4059a09f897f34584d9c517a950531a2869aa1af0a3029fd4f5e17bcd4f01014f259d000397ecaba57de018064070
+EBUILD tempest-32.0.0.ebuild 2138 BLAKE2B c1c17ef2a0cce940b9befaafe8815d4707788a309b6aae90092adb35b7a0421d0b6a9aa886f217f64b097e617411901b49be719d81eaacd8a798dcf60072532f SHA512 9c321710e01ad2ab2181d023820838bc7ecceba6f9e4478d1d582a17e8f830069fb25a560884b52484886a1ae157089f56afe974a09a14514453d81e75d146ad
 MISC metadata.xml 392 BLAKE2B cf7565379c5e1bed34940d0771212eea2a7ff81949678e0a645ce4d7d1c3da88febc0bb5a2ca968de8962d63610e37b0f3adc6e0661ae9de8c656d5ce0ae9c0a SHA512 41d760432a3c46d0fce432e6d431cac110e2c271796d0d04ee026347f01ff3add7db90edfdd83397190e5a563f04c835b250052763ea9daae788ac43519a769f
diff --git a/dev-python/tempest/tempest-32.0.0.ebuild b/dev-python/tempest/tempest-32.0.0.ebuild
new file mode 100644
index 000000000000..e5d757d4c5b8
--- /dev/null
+++ b/dev-python/tempest/tempest-32.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Integration Testing"
+HOMEPAGE="
+	https://pypi.org/project/tempest/
+	https://docs.openstack.org/tempest/latest/
+	https://launchpad.net/tempest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		dev-python/stestr[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Small subset of tests, which fail as result of not using specific
+	# testing environment. Others expect to run suite using stestr.
+	rm -r tempest/tests/lib/services/volume/v3/ || die
+	rm tempest/tests/test_list_tests.py || die
+	rm tempest/tests/lib/cmd/test_check_uuid.py || die
+
+	# remove dep on hacking
+	rm tempest/tests/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	mv "${BUILD_DIR}"/install/{usr/,}etc || die
+}
+
+python_test() {
+	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
+	eunittest -b -s tempest/tests -t .
+}
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 85b49fbfbfdb..71a10645f2e6 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,5 +1,5 @@
 DIST textdistance-4.3.0.gh.tar.gz 45535 BLAKE2B e43ae62b0b7656a6c4f879b1d8e0c34ae6c83705d324aa99bb7ff6e2d0166faf1fed3ee7bc06602388c16c742a1983a4eaee143b09a7c371b9e941d53edca2b5 SHA512 30d68048b1f0b79e584f5f07731e03193af64cb2de3f52882c17154cc027f4ff8d590b994941bd5d62642d4da334ef0739d4bb65b6b12f039a1ee9aef154cde4
 DIST textdistance-4.4.0.gh.tar.gz 45542 BLAKE2B ae144cb7179b589f4106ea378e538e0d0240e6e2ac74dc5de8222ec2f671fcd09c4705cb5b30308fdb2f6071578d337c0f88983511229d9f7eb86c924d65bf56 SHA512 727696b76ee8fdfc9bcf028a93baad38882893f62612fa08725e5e8cd104b9450977e3682995c4aa7d997afcc8fdb73e3c72ea6c1a097a9a19dbce98957d4798
-EBUILD textdistance-4.3.0.ebuild 823 BLAKE2B ca9eb7697c93acb7b5776287b90ca426976b9573cc6d0fa0818a825dc95890137134d2330daee415a0993b8b46396e4bcc5f39f44ee484100fa3f200c98f4889 SHA512 59c71638a315ba2760da220f3a19a4f11179d5f9ad95ff93ebed6a4493b768cdb94b1d95746bea7108d41649f68f5e1f3e8ec5a20aed934273d31bcf4633b679
-EBUILD textdistance-4.4.0.ebuild 847 BLAKE2B be78d3030e886a6b8b0992e04b4f55e60cc84853a044f885c1b6d52488cf81a6804a5384821c2c1744c6e9dfbc3015dd7de50c792d04e8c37117f49568059eb1 SHA512 da247618f6ccb12e34cd3f2d1681ebeeca1a6f85abbd12e7c9cb2e9bacafc4145c9ea65ae6ebe558be84ebd3b5d4a54cae7801b2f511091bbc53333bfd7021af
+EBUILD textdistance-4.3.0.ebuild 816 BLAKE2B f21b515d4df763262ae22f77bf1e720df616869cf24a71b2d3d218a4576f055afcd230cb6ec5a1219968481ef4eaddf686e24b5644f4c0f1553db8d019876712 SHA512 f054497bde2d2e74d6b956ef9c671d8eac321ad8d159fd3151af3c32cd1536470ff6ad5d7283d45745f9f6c8012b732785fa69f600dd0db62134c1cd62a94f60
+EBUILD textdistance-4.4.0.ebuild 840 BLAKE2B 8d6e2ee67118d70c73b27cdc7913bde4ce73cf03ed36658a9f94ce9ac21d89d946457777584d5f4496b27b696b99df06867185d51b723a39b44722c0a481188c SHA512 46aeccc5fb7204836c72d26fa069bb5c267f89f908fb05437c76ae946ebb0c73282a87d891a63935bc733efccf1b73984ae44099da3583cce6fc8965f14f5514
 MISC metadata.xml 517 BLAKE2B a429684151f5700f148c5350b16026e797fdedc80b950d3c79c050a4d7418763918a05936eaeeed07b9756d9ec39602128570cd8c27049234bbda27e006ff00f SHA512 be445c2c21f5fd0bee241f8f76094b51c2fcbd7fe0d2175f7455beb881c3b83e8070c8a14817695d2b7a7dfabcdb856e12d7749aadc91ca31f7af8187e9a409e
diff --git a/dev-python/textdistance/textdistance-4.3.0.ebuild b/dev-python/textdistance/textdistance-4.3.0.ebuild
index b7752b1c5c8d..181a9035a3f4 100644
--- a/dev-python/textdistance/textdistance-4.3.0.ebuild
+++ b/dev-python/textdistance/textdistance-4.3.0.ebuild
@@ -22,8 +22,8 @@ BDEPEND="
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/isort[${PYTHON_USEDEP}]
 		dev-python/jellyfish[${PYTHON_USEDEP}]
+		dev-python/Levenshtein[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-levenshtein[${PYTHON_USEDEP}]
 		dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/textdistance/textdistance-4.4.0.ebuild b/dev-python/textdistance/textdistance-4.4.0.ebuild
index 6b3f959525b4..427ee9e48841 100644
--- a/dev-python/textdistance/textdistance-4.4.0.ebuild
+++ b/dev-python/textdistance/textdistance-4.4.0.ebuild
@@ -23,8 +23,8 @@ BDEPEND="
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/isort[${PYTHON_USEDEP}]
 		dev-python/jellyfish[${PYTHON_USEDEP}]
+		dev-python/Levenshtein[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-levenshtein[${PYTHON_USEDEP}]
 		dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 4e47623e4a20..1d3a1c0257ac 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,5 @@
 DIST translate-3.7.2.gh.tar.gz 1153306 BLAKE2B 986c531004cb0ee0a58a940043377ee047e13b0f32c6fda5ab80cc7fca96d18b45f2cd3e112d47f177cd06a7e99580777c6591df969a8237bcb9fe7a52b1d4fd SHA512 28d774ff670c92dedee5d98d7d33f21d32ed4b7afd6a8281fcf7abb39470e11a6c0d9c121576aa2be10edf18929c74b2cfc36b70984d66d432cfa5e337b9556c
 DIST translate-3.7.3.gh.tar.gz 1153916 BLAKE2B 476b8ca3fd277f56cc73d8fc8f5adbf9ddb442b404c586627cc91af228ae08bbb87310219c910701de4938cb9977b386d0ed7b503901369a1ac5069664ebbd25 SHA512 ee339300e798fc043b1ac5455366e96bd5dab08306855a84cdcfd6d5176560366c3538810e94b7477704a5d1ed218e5c85f735979f48cd33242791ce1ad39c3b
-EBUILD translate-toolkit-3.7.2.ebuild 2420 BLAKE2B 55272a0cf5f90152cdac723e3523cc4e06d9130c0b652f7e43655bcec6d92e4a12463544d0a613086713c41ec75a7c2f53924120794daf8d81ad98fe2a70368a SHA512 d0441e2c77159d6b0f75be7b2fc9c96920422e142b7cee1c494ae2dc3cbaf44956912d797731ad0267b1dfb6b05a8af1df72db285b8129e4d8228b979fa2df88
-EBUILD translate-toolkit-3.7.3.ebuild 2423 BLAKE2B 567256ee0892925d8f4322e2908ba123b7a05e15d3fa8cb0e43412b053773066dfc9db5a81cd3b7c524632920ccd63044f7135d6c5078a34b11f60d637223cf7 SHA512 8094446117598ae75d365c87f7cde4935033cc01ec55698d381be58ba1cbb294e0e2858a99de41a1867fe8bb4c567d6da4029d978759713d04004e4df638008d
+EBUILD translate-toolkit-3.7.2.ebuild 2393 BLAKE2B 1232b4859241b692c082570966e4376d46964f9b1e48525a2c66501e7bf7b68b1603c84705ef134dafe046bf28cdb8310c837a7ce9836375a43bf32d19e70b50 SHA512 d59ec6510c48b9d957aeec1032ea43096b78c4f2c06a9349d2d0ce49baa826bcd0b6765acf7e878326fccdba104456930aedcfdf588fa463b732b0033b8fb1dc
+EBUILD translate-toolkit-3.7.3.ebuild 2396 BLAKE2B 714dd7972065e5606c950d2c2c3cb67f0a407a0afc4930fe82df0ec8a06585a8ed93d126645920807a55f3894eac8bf9f7ee5afa69a06fbecd36abf26d50045b SHA512 a9e7c4215449dfae43b234cc874d7051bc8159b037611b50ead3e60d7c198108b062b2da9e4cc2e6d062867cfd8f9944811fa18588131715377232fa58f0cb6f
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
index 7022e482cf3f..c7db5dea2e22 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
@@ -26,13 +26,12 @@ KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
-	!dev-python/pydiff
 	app-text/iso-codes
 	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
 	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
 	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	sys-devel/gettext
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.3.ebuild
index 7c5cbdaf61ca..713bf4685a40 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.3.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.7.3.ebuild
@@ -26,13 +26,12 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
-	!dev-python/pydiff
 	app-text/iso-codes
 	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
 	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
 	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	sys-devel/gettext
diff --git a/dev-python/uc-micro-py/Manifest b/dev-python/uc-micro-py/Manifest
new file mode 100644
index 000000000000..b77e6744c360
--- /dev/null
+++ b/dev-python/uc-micro-py/Manifest
@@ -0,0 +1,3 @@
+DIST uc.micro-py-1.0.1.gh.tar.gz 6235 BLAKE2B 7ba5935e97d9926789cde37491ce09235f467781ddd99dc841f70bd42a13c87bdc3a7970684cab81684620c1c49e1bc316faa0d4e8664293c76cf7c86e24c446 SHA512 c6747943bd4ac9a3b7bf8d02a52947df04d4d4986311da7fa77d6ae010d512de9ad429d78a436a2f8e11c6f2d8dde00bea70ea0b1237a35e5b16ed4ad6b430fe
+EBUILD uc-micro-py-1.0.1.ebuild 596 BLAKE2B 6200903f4e6128b753c4c0e10c64a8f5a08ea100680d093fa663445d8edb67a09b230c2c9394c6a76966bea0df9fb6665f23f53b94ac2fd1fc0c20fee7ea58df SHA512 3e90cf5ecb21708ad074d0272bbd887a43dbefac95349cc710a9cc4e67d5bb8a52fabb49cea371f794226c79041d00be00f79e771dde02ac8a3c90067b1f9d04
+MISC metadata.xml 398 BLAKE2B 50edd762e30f62e95f9dcb2adf2e41ff274dc211503ce4da4bd2bd44730c4d23e8eb35acf76ad00cf7207f197d277eea2dfedcfec776a09157d0975d00738fd2 SHA512 4b4e9fbc1618864bb5007f8d10b4d54768152e09a043f719559063ef4799ce87bf500580cd68694988b3d42e4c43bd21b728f2c37de48b59d968718292726ce6
diff --git a/dev-python/uc-micro-py/metadata.xml b/dev-python/uc-micro-py/metadata.xml
new file mode 100644
index 000000000000..c91cb5f9f4b7
--- /dev/null
+++ b/dev-python/uc-micro-py/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">tsutsu3/uc.micro-py</remote-id>
+		<remote-id type="pypi">uc-micro-py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
new file mode 100644
index 000000000000..f83f139dc86c
--- /dev/null
+++ b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Micro subset of unicode data files for linkify-it-py projects"
+HOMEPAGE="
+	https://github.com/tsutsu3/uc.micro-py/
+	https://pypi.org/project/uc-micro-py/
+"
+SRC_URI="
+	https://github.com/tsutsu3/uc.micro-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc"
+
+distutils_enable_tests pytest
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 79d839561f0e..3cc318b64266 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 73a20c936105..e3793df50ac6 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -108,5 +108,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
-EBUILD tree-sitter-cli-0.20.7.ebuild 2898 BLAKE2B 4ffc144fb80272cb2e461f19c0c01d060ca1925b41799402e61853280c3116c04f6c3231b117777e64ccf93df480a1a4914d8894e21533bf8b7264499c242429 SHA512 175579886d081b8862c09f46542750e689a59a87e5982249ce92b9ff43d5118e85e2057941fe7c15bf023bb8143cb9f05bcce5cedfd2850d7eea658e8e931b25
+EBUILD tree-sitter-cli-0.20.7.ebuild 2910 BLAKE2B 5aca7cececc6d2076f05768062414bce21c76cca94a7cea2edfa744c00772b8fe5ad91b8389d655dba3204e09419079269ffd5cc29d3261042058b646bf66eea SHA512 1d05f33aff629f6ad4b87b7bdb7d64cca7d9d3b4f995e88bc89eadaa198add52bb9a5748b76aed4fd10662f27be9f7421233a5544263e93a7be6e24d94296e48
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
index 6ee876a33d2b..8eca530ddaca 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
@@ -124,7 +124,7 @@ S="${WORKDIR}"/${MY_P}/cli
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 18ab8a3bb6f7..50988f44ce28 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gif2apng/Manifest b/media-gfx/gif2apng/Manifest
deleted file mode 100644
index 54b3011d8843..000000000000
--- a/media-gfx/gif2apng/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gif2apng-1.9-makefile.patch 529 BLAKE2B 5e3a0fa8b5e05b0b69f15e4fe6674efa114d09c8abb4c96b538cd19655509573e6d951581afb665ba7568e9460ffb5e5ca98820041f83f559048cdcc34ba69e9 SHA512 f76e3249e8c02b4b4381a2bdfe34bba31f52d4552271b2e66eaab8214366f3464b24624cacc3597b74dfaf7c198d513e18bf9888eb0478e3372e6d3f3eccd809
-DIST gif2apng-1.9-src.zip 258946 BLAKE2B 217cb4eaacf80b9a9ae4eb7ea298106d9763c825110c154b95a80e83f12ea9275c0b5bd7f2998fab6266b3832b5cae76badda7bfff1c992f21d31bba61016041 SHA512 6f161699aad949466c60e0fb6abb2f38e7ec8353dd15e65ccb9944a66dabc5a4acf32523cb64073c73290e54cc2b753db68123c14f3f7789343491a4f65dcd2c
-EBUILD gif2apng-1.9-r1.ebuild 640 BLAKE2B 84943cc21352fd36935b183100e45eec667be7a19632fd86251e17e1a65e28e2d97a8704019494951a467778d156d1dffa821a662b3dc74862cae51d4d6f18af SHA512 ce73b3e42b02b2f669fee62709a8575cd6b1ecfdb559fff4ac979dcd0bac62e5271520bc7974f55412504b8ba2ad5a032aa8f13e014c83e68e1b6e0f2fcae1f8
-MISC metadata.xml 246 BLAKE2B 2550b4a705b4108f596913390914ed505a8e132331a2b1be4c57dab38a402133af5fd114778ccd11e1c34964288bf2dcca75d2b819be20f716310f64b14fd67c SHA512 6c34a691de0a7e6f5dcc75e2b1dca5bf001e14882cf67ae8de44079b74383a8347d857f5575794c50baeb43d1c3699e5f916f8d5db0a99d9b54e27c72966ca44
diff --git a/media-gfx/gif2apng/files/gif2apng-1.9-makefile.patch b/media-gfx/gif2apng/files/gif2apng-1.9-makefile.patch
deleted file mode 100644
index 2322e214fbf0..000000000000
--- a/media-gfx/gif2apng/files/gif2apng-1.9-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- gif2apng-1.9-src/Makefile
-+++ gif2apng-1.9-src/Makefile
-@@ -1,11 +1,9 @@
- PACKAGE    = gif2apng
--CC         = gcc
--SRC_DIRS   = . 7z zopfli
--CFLAGS     = -Wall -pedantic
--CFLAGS_OPT = -O2
-+CC         ?= gcc
-+SRC_DIRS   = . 7z
-+CFLAGS     += -Wall -pedantic
- CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
--LDFLAGS    = -s
--LIBS       = -lstdc++ -lm -lz
-+LIBS       = -lstdc++ -lm -lz -lzopfli
- 
- INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
- OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
diff --git a/media-gfx/gif2apng/gif2apng-1.9-r1.ebuild b/media-gfx/gif2apng/gif2apng-1.9-r1.ebuild
deleted file mode 100644
index 9e8aa44e1c0b..000000000000
--- a/media-gfx/gif2apng/gif2apng-1.9-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="create an APNG from a GIF"
-HOMEPAGE="https://sourceforge.net/projects/gif2apng/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="ZLIB LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	app-arch/zopfli:="
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r zlib zopfli || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc readme.txt
-}
diff --git a/media-gfx/gif2apng/metadata.xml b/media-gfx/gif2apng/metadata.xml
deleted file mode 100644
index e855e7e17956..000000000000
--- a/media-gfx/gif2apng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gif2apng</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 476e19290f32..56d89d75f82f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
deleted file mode 100644
index c2de66a08a51..000000000000
--- a/media-libs/libaacplus/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad74bb46e1fe84ba616558ffc4635ed15414bced6e438c7f7f96db4ef2adc2e134e0495a16714e244ceefdb0c0e187fd35ae137e672b50f24480a SHA512 19fb221b29f1e65f26146358943bed62e0002dd8dc682d9af6134f8f497ce67901fb4ac1eea6c957536900715f82e36914e89f70bd5c50e364dc7f72a13bb340
-DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
-DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
-EBUILD libaacplus-2.0.2-r3.ebuild 1378 BLAKE2B 488d8ed4cf75afdfa4b7db11f94f62f18d5a28759473991bdad0121099819f0ef4ede5138a35ee9f42610ff0b99d051c990d82d784745d3aaf9ba41b4f0f5bfa SHA512 0df8535e28cefee9688f427352a10309193177e9cd42ea3dc52f12354ee4b17c8ecefd50a45835e7216853b38a11b334718964c797566b55141d22d2d55f418e
-MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libaacplus/files/libaacplus-2.0.2-clang-inline-redefinition.patch b/media-libs/libaacplus/files/libaacplus-2.0.2-clang-inline-redefinition.patch
deleted file mode 100644
index 64940a439db0..000000000000
--- a/media-libs/libaacplus/files/libaacplus-2.0.2-clang-inline-redefinition.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix implicit gnu89 inline semantics causing issues with clang:
-* main.o:main.c:function main: error: undefined reference to 'AuChannelOpen'
-* https://bugs.gentoo.org/show_bug.cgi?id=458932
-
---- libaacplus-2.0.2/frontend/au_channel.h
-+++ libaacplus-2.0.2/frontend/au_channel.h
-@@ -12,7 +12,7 @@
- 	int	aFmt;
- } WavInfo;
- 
--inline FILE* AuChannelOpen (const char* filename, WavInfo* info)
-+static inline FILE* AuChannelOpen (const char* filename, WavInfo* info)
- {
- 	unsigned char header[12];
- 	unsigned char data[WAV_HEADER_SIZE];
-@@ -48,18 +48,18 @@
- 	return handle;
- }
- 
--inline void AuChannelClose (FILE *audioChannel)
-+static inline void AuChannelClose (FILE *audioChannel)
- {
- 	fclose(audioChannel);
- }
- 
--inline size_t AuChannelReadShort(FILE *audioChannel, short *samples, int nSamples, int *readed)
-+static inline size_t AuChannelReadShort(FILE *audioChannel, short *samples, int nSamples, int *readed)
- {
- 	*readed = fread(samples, 2, nSamples, audioChannel);
- 	return *readed <= 0;
- }
- 
--inline size_t AuChannelReadFloat(FILE *audioChannel, float *samples, int nSamples, int *readed)
-+static inline size_t AuChannelReadFloat(FILE *audioChannel, float *samples, int nSamples, int *readed)
- {
- 	*readed = fread(samples, 4, nSamples, audioChannel);
- 	return *readed <= 0;
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
deleted file mode 100644
index 6db528358739..000000000000
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-# This file cannot be mirrored.
-# See the notes at http://tipok.org.ua/node/17
-# The .tar.gz, ie the wrapper library, is lgpl though.
-TGPPDIST=26410-800.zip
-
-DESCRIPTION="HE-AAC+ v2 library, based on the reference implementation"
-HOMEPAGE="http://tipok.org.ua/node/17"
-SRC_URI="
-	https://tipok.org.ua/downloads/media/aacplus/libaacplus/${P}.tar.gz
-	https://dev.gentoo.org/~aballier/${P}.tar.gz
-	http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/${TGPPDIST}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
-IUSE="fftw static-libs"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	!media-sound/aacplusenc
-	fftw? ( >=sci-libs/fftw-3.3.3-r2:3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-clang-inline-redefinition.patch"
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
-		-i configure.ac || die
-
-	eautoreconf
-
-	cp "${DISTDIR}/${TGPPDIST}" src/ || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_with fftw fftw3) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/media-libs/libaacplus/metadata.xml b/media-libs/libaacplus/metadata.xml
deleted file mode 100644
index cd1cfc033621..000000000000
--- a/media-libs/libaacplus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index a39144dcae41..5c06520c2211 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -5,6 +5,6 @@ DIST libbluray-1.3.1.tar.bz2 754867 BLAKE2B 471963bc5b77f9da31c2ad900e7bbb152894
 DIST libbluray-1.3.2.tar.bz2 757957 BLAKE2B e970e07f6ad216f7bdac866acfb87400b4fbd511ad41293f0aa93e6cc04f77bca249c78b75eb89d92e41c9a1d25df93c4cab53cdb2cfd27b8a47233bbc277cad SHA512 6f2d3a984809db33a99d2fe3618370a3fda3ef1c417b725d3c2e1f24ff21495f95a6a5f78b30b2b26bab47865f68dd08c08e8a554809d3a5225956da712dc064
 EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B afdec663eeda2df1dfda5bab20fadc416b718c0f1fa9198c9d382316f79220dd7773b3e8fc16cb37c96202fd6a2bb2004093b785caf572debe94e410fc70965e SHA512 ad3e56facfd5a192c3787096414baeaf0fd29a7f2e9550739c42ef76670aac2ff8cfd6390f46dd3fc6076b1384217c02b19d8739369fd969ad1913475a3d7b02
 EBUILD libbluray-1.3.1.ebuild 2055 BLAKE2B 386214b48440b49fa436b3e48aa261a9ed7447089590189bca0aa0ed959ee7a48085a9a065c5c6095b74aee541ede6d68494d57d95ee190870e6e652295da4ed SHA512 4bf8f7fda1832f6ed9d951eeef24ef04ff6938443887cfb84d4cf6ff94021dabd989fb65d5d34f2945751a2a790a7482c636dd0c6101da86ec14b98e3a0ecd5d
-EBUILD libbluray-1.3.2.ebuild 1965 BLAKE2B bbf25c32e4074d637bd4e0280518d77c75ce9b1b12994e695f749d22329ed840acd457f2880cfec72f143acd2a402b5d97f286e98d22c6eb0c1dc9d12a37b091 SHA512 2fa80be8117b9b40983c8c4bb14efc27aefc16f929dfbd369b183833c2ef751082b0816f0183a41fed848df309c79e67b534c86a41017bb161258c4fdb306880
+EBUILD libbluray-1.3.2.ebuild 1960 BLAKE2B 66c522544ba6786b46c08f620f65c40b79d9aaf826283ec8362fa0fe4a9c0197862ce8a6e93408c6503ed7dea8931b11ee53e042e10934d7ca03a2fc9f5eef5f SHA512 ff981aa8143118a59e7eccdab56bacd0b8b9918f8eff508ecd885b78d28fb6f3348d2555c277aaea4f46e3435d7e9b63b8b84efff2d66a34ac8a580445b49650
 EBUILD libbluray-9999.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
 MISC metadata.xml 541 BLAKE2B 5a2652471709a6c8784f756ad2d5c9bbfd1611637fede987c298e1b4588ddab74346ac0d607c36bc3fa662a1e80287d2dd9963019b52daad9cd3ac2f0ecff02f SHA512 70349aab49af818166f114ed16c0eaf4264e548e8f204d636da57086b68a17f42a6b119a2533a5fb9f6a60dc3c3a9948910536f4eaecb1a75e682d439b12d558
diff --git a/media-libs/libbluray/libbluray-1.3.2.ebuild b/media-libs/libbluray/libbluray-1.3.2.ebuild
index cfd1aa5c056a..4675c4cbd2cb 100644
--- a/media-libs/libbluray/libbluray-1.3.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV#9999} != ${PV} ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Blu-ray playback libraries"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 096d10f4a757..27be1bd5e93d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 5b4064865dad..6a4d5d349ded 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -3,5 +3,5 @@ AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d430
 DIST amsynth-1.12.4.tar.gz 1624416 BLAKE2B 1dcd2454d94200b76097d4215ed419123a3b8427064c8f674a1e7cb27620fb5b2977470ea7feb8114c429ed904511ec73c73461b7f38e1388e4cfeabc4e68ec3 SHA512 502fdd1d6c4e54a57482d266977d78008efa26717c173be0bf98e907a111366fd80b65d667b9448e751085901dc5f2a61ac0bf5b1d02e35c695ecd99c9d1df00
 DIST amsynth-1.13.0.tar.gz 1626209 BLAKE2B 29b79f18ca0ddbba77aaf1bde738f235698f0debe2ddea3b9f2bce2eeaaa399ba125f72b97c83157b87bb28bdb4a259ae2e535c87def16a9e1af3d3093bf0270 SHA512 29698be7d690c76a46a0c8306d6c3b94630b25ed9a3524d7e27d22e244f5c144b74b8473f09eecdb1368443f503ba7024d1c71ead6794f11a2d1cb2114c84bd5
 EBUILD amsynth-1.12.4.ebuild 1151 BLAKE2B 4feb08fe1ab1b3817709aca28d7f659566e76e5b819905ff2c4a1aa2e63209bd617aa8fa3b3f0196f343331483eb5c0595918675cd72761f0343fb9cdcc91350 SHA512 532c7810d7cd4a5dc5b033d9e197a26b898db708a5c4318d967e4565a1c8d21c4a20c2a6205021357e6ad54d13c9810a6c0357eda48e7ea9fa9c126afc4f5062
-EBUILD amsynth-1.13.0.ebuild 1166 BLAKE2B 50493cee4e2b02347ee66d0d445b41cdbaf6143bb15c794425a0c0caf122f57c45e3c7501c82afde57983f58993112c9886ea5fc3eb9aac2edd4b278813bbbd7 SHA512 b1fc9877ef6cad92857835bf536daee404ac87c99a1ab00c115f85ffaf2ccd939e1a4348feeb7e5f8d9ba4a4c18698160b522ed1b76aff9707df534b1af0b2f6
+EBUILD amsynth-1.13.0.ebuild 1164 BLAKE2B 9560c7e135763a7ae5a02a09bb91378eb217b90aa5690d98f50b07ff0c8df4ef206d46260daefedcb45a57abe1261b694e34465b12140b10c832694a99655b33 SHA512 2c582fc017f11ba2288f5c22e91824db3fe7399075bb1d73cb59eb7d0a2da2a55a0070a84879ea1270ba24e632e8dab19ac8b641b47df0b980bf251b3c3f08dc
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.13.0.ebuild b/media-sound/amsynth/amsynth-1.13.0.ebuild
index 19dabda91b84..69141b780d91 100644
--- a/media-sound/amsynth/amsynth-1.13.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
 
 REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )"
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index e9ceb69b2696..90036ede28c3 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -2,7 +2,7 @@ DIST qtractor-0.9.26.tar.gz 1868666 BLAKE2B 3e0febf185ad5818bec00c3b66cfdcf8e2ff
 DIST qtractor-0.9.27.tar.gz 1995105 BLAKE2B 08b3a18d37eb700960e24741178079deb728f909f80fc00491abbe832c1d1966022ec6bd2c24469047b53b168a7e084a7d76da96e587afff78662f2f1c9b1d26 SHA512 2bcd4c5676fda58c7cf9ad9a9dcc139eda11c69b1c608812ff912ff63da56fbd0ba6b76828b326038365c9d84519bc752c54572e8edbf573e6cd0d068a17faf6
 DIST qtractor-0.9.28.tar.gz 2000685 BLAKE2B aa0d71732b9d214da22a97ca15d0c54eb61b7c35656f827bd0e39f5b55981b0c0d29645d5d3c4280ccba6aab971171615ef099f1cea1f3a8c381ac0dfffd2ca8 SHA512 db63766bcfd5a744a532d68cbe6f3153f9dd02208bca5098b27cda1cbec694b2981b3eb6a7912324c07327c000087cb5f5ba46dccc96398d051e011ce563fc67
 EBUILD qtractor-0.9.26.ebuild 2443 BLAKE2B 55b7a06d8840c4b0303511e5a2b790a80672f95d5e270b3bccc9232562902a1ca6eea92de9586fb598976de0b54190139f34342024358569d823d121ec313a5a SHA512 f71d82260c8ad9ff055ca1c881a70924338b86b2360d56b5cec580296ac8d99863ec27cdf9d84ba85883165eb454b1fbfccfd51fc4e5e8eaa0f9d29505e6f18c
-EBUILD qtractor-0.9.27-r1.ebuild 2505 BLAKE2B b5b7e2648460990bb9b70a871d73884ef5a548d63776209152c5a89b5f66be692f692566dbf6965594df97073617c56024f97ec564b8245860b2587d851821df SHA512 363c99eaea284ad66a1cd246069e4feefd0a2c0d5bae1ec7f8093b1d3d205d0f9c07ce17dcd85ad9e2111f60c0086e5b5e4e2b183e7f8fec00c15dba20e495b9
+EBUILD qtractor-0.9.27-r1.ebuild 2503 BLAKE2B 82e268d7cc532cfa54937bf76cce36751f546ceb924d5cf07908f0423529ed93a4c3ed526a17ae472781b26a04977da2f0892656516ba3da906bbb981f87c5c1 SHA512 a029c76b6386ff1e10eddefa0738591a51b60b0564266f5defe2a26c6aeb25d2b6719c62a97396cfb5e1df7a49ee25dc6212bd5835b7afaae55605ccb891d912
 EBUILD qtractor-0.9.27.ebuild 2445 BLAKE2B 7508a7aea3d74dc68d3a8fffa85f733bf1772d5f87dd545d6dc3ab6ea2e75d8aa96b0320014236f855a667fabac9e14fb603859140c1f5ba733b0ecc4faf8abd SHA512 acddfa87c474e4876081bc1ad5b7607fde4ac785ab10d0ed5e97711b32f4de0c8e827833d2a3a91222ed5409e2913ea3eefdae5e13bc66634ecff0a168edafff
 EBUILD qtractor-0.9.28.ebuild 2505 BLAKE2B b5b7e2648460990bb9b70a871d73884ef5a548d63776209152c5a89b5f66be692f692566dbf6965594df97073617c56024f97ec564b8245860b2587d851821df SHA512 363c99eaea284ad66a1cd246069e4feefd0a2c0d5bae1ec7f8093b1d3d205d0f9c07ce17dcd85ad9e2111f60c0086e5b5e4e2b183e7f8fec00c15dba20e495b9
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.27-r1.ebuild b/media-sound/qtractor/qtractor-0.9.27-r1.ebuild
index f3c019cec2bc..57db29bd6746 100644
--- a/media-sound/qtractor/qtractor-0.9.27-r1.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 01b5088dca82..570be32c8125 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f82496810a03..3f80bfb67520 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 15:39:40 +0000
+Sun, 18 Sep 2022 21:39:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2cda540dfb13..8d8b55866227 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 525759 BLAKE2B 487aaba91a7a713d59ac9586bbe0ffaeb7bf01fde9781422d78f1d1e009e745a8cea346fbefedc07f275060c3798240f56799ae9f182d10305c04a36eac8db25 SHA512 9ad37d1ae3ef248f0c465e37bce58b95e6f9da024c5d52c9ede183ff971546b15abed0e4dd4ca83a4f69fd2c722ad188eb583dd8d8337d8d99ae3e7c776b7da4
-TIMESTAMP 2022-09-18T15:39:47Z
+TIMESTAMP 2022-09-18T21:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnO8NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnkCNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAkMQ//ZfjjI570kuxhcU6g/I/fkSvIvSkGOlh9oEu8UhjCnZ+hDfvRu7mXcSDm
-SdyO/rYpuavjBd8jvSIqqrlEt4inZ8yXh/ipQZfFmsoorUCIqDXI/lBuG7ZpKCjk
-q3UNreis1OnxsGsKv+7KGdzFdhXIiwGznQODKl2wJBw3GGIa43J3nCyNC12l2yOk
-wUSSH7GB6W8qmkU7VxHU1iAEl1X9HTGyVenCJ3Y0jCSqg/w6ppSzkEXZqwrjBsCK
-4DMlowJHxochNCPli3pFLuJEhTtwcSmUnkh1ObNCGGByESAXwF6zf+ALwbivBld0
-dbxei+rTjb6xgXDNoh7kuApbykoAk2aN63C1xAzTXci03n2N/kChowPCdGoJj23+
-vG+OFYpTIQRsddht5VdGXJdJM9Pk57Zux1MZsKCNXOOf5+1FHHgEuCX+TYJfBN/c
-LXgsOr9isqM9CmhvWPjlp28MkDlYTJKvdpzplyDnFPTTCGzZvLGu1Q5CQNTzhLBv
-MMUoBpsbTq4VZsDvrKmrbgo5Sar/5VSSmI6qr7ONBJs8BEi+XtJdWRUs8Xpxy1Xl
-TLNaoGiNeaUNLV2N27mqV2Se9o95Ex+wVSac/z7xtu+zKmgTKMOlg+j4b9dQROuU
-fOxNcsLQfLd+hR9uh5Xy5yoApvnM4B0TP05Itb4p/c+hn1iaxlw=
-=ryfB
+klDPYg/9Gi18aSPBQu1eU6qTmhy3iaP9SHRiqKwvwH5hikhsUE/DzW9ygAauCt9F
+n43Y2vNQgeJNnC2pc1dUibBuB91rHA6w8m99brzOsBKNRfQMN0Hm0Lh6XLfyhcAR
+0LE0XIP2B4PktGz/ButkmJvOOBIQGlF8LJ6wI2EOkLVqK1QcpXFA7HgIGjLMN7Km
+mlkLAsCGu8YG6yKVazuqEdw69ZMtPtBtKLijpphQ3DkHH17EhtVBclmUzIuhCEWU
+hNa4/+O0RCpy7fkgkSe7tlSzabN2iB+xPWKWMhkweLiSU1Lt9E72MTcszzUw5NM/
+hz0TPIqMFwvpNER+5WJOcYjWthCHjhN/EVGIz6yuyLZhKFO0EF1UX73jDq6XlywT
+SdofaChb457lGlbXfiI67KeSoQ35WuRYBb0XevQRJd2/11issDq06evANFN5Ojwj
+GGHp4yXjlEYjCcFhv0xmiGeelIyD9qq662eoJeJ0zwpdoMqhtue7u1bxzRpaXiX/
+5ygd163eNbyrIvdtcj5Gyd6ak1nabLQyY60qSIXi1m0seNdNeMTM3vLnA+QUvUxg
+U5c/vPYKeXmS7NBQtbsUArB5YYB5yXZG/dRm2VtoN2rE21/9g7VIhIN4C00rVCFO
+wjbE16agfbXTyjfzNlYdQyQpW6lGNWepN8dTpQI6oza4FuglimU=
+=t4RX
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f82496810a03..e5a7ee9c0fd6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 15:39:40 +0000
+Sun, 18 Sep 2022 21:39:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a3c40531c337..e480ddb785bd 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 a16d00f59be2..28d196ad96b5 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/logcheck-1.3.23 b/metadata/md5-cache/app-admin/logcheck-1.3.23
deleted file mode 100644
index 740ab32e532a..000000000000
--- a/metadata/md5-cache/app-admin/logcheck-1.3.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=acct-group/logcheck acct-user/logcheck
-DESCRIPTION=Mails anomalies in the system logfiles to the administrator
-EAPI=7
-HOMEPAGE=https://packages.debian.org/sid/logcheck
-INHERIT=readme.gentoo-r1
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/logcheck acct-user/logcheck !app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
-SLOT=0
-SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.23.tar.xz
-_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=1ee8ed0d65e0240888e2a660b083e61d
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 2e54e34a9bc0..b6e07bddd2fa 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.1 b/metadata/md5-cache/app-containers/buildah-1.27.1
index fb66b89cbcaa..fe7b11d14a59 100644
--- a/metadata/md5-cache/app-containers/buildah-1.27.1
+++ b/metadata/md5-cache/app-containers/buildah-1.27.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/containers/buildah
 INHERIT=bash-completion-r1 go-module
 IUSE=selinux
-KEYWORDS=~amd64 ~arm64
+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.1.tar.gz -> buildah-1.27.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8e828adddeddd2108846fbdcf949eb9e
+_md5_=6605344589502b58e61b6a1b2014ed0c
diff --git a/metadata/md5-cache/app-containers/cri-o-1.24.1 b/metadata/md5-cache/app-containers/cri-o-1.24.1
deleted file mode 100644
index 15c6a9874f5b..000000000000
--- a/metadata/md5-cache/app-containers/cri-o-1.24.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-crypt/gpgme:= app-containers/conmon app-containers/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables app-containers/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=7
-HOMEPAGE=https://cri-o.io/
-INHERIT=go-module
-IUSE=btrfs +device-mapper selinux systemd
-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/conmon app-containers/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables app-containers/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) !<app-containers/podman-1.3.2-r1
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/cri-o/cri-o/archive/v1.24.1.tar.gz -> cri-o-1.24.1.tar.gz
-_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=bd02e6162824b7fc8b01603969f7cd4f
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e401ede18ba0..8a04cc277bf8 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/carbon-c-relay-3.7.4-r1 b/metadata/md5-cache/app-misc/carbon-c-relay-3.7.4-r1
new file mode 100644
index 000000000000..c5021b48411d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/carbon-c-relay-3.7.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0= ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma ) acct-group/carbon acct-user/carbon
+DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
+EAPI=7
+HOMEPAGE=https://github.com/grobian/carbon-c-relay
+IUSE=lz4 snappy zlib ssl pcre pcre2 +oniguruma
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0= ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma ) acct-group/carbon acct-user/carbon
+REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
+SLOT=0
+SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.7.4/carbon-c-relay-3.7.4.tar.gz
+_md5_=9e7345c45256e604878021cc6f3256fd
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.11.1 b/metadata/md5-cache/app-misc/tmuxp-1.11.1
deleted file mode 100644
index e8d0d77d08a3..000000000000
--- a/metadata/md5-cache/app-misc/tmuxp-1.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-rerunfailures-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/flaky ) test? ( >=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/libtmux-0.11.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=tmux session manager. built on libtmux
-EAPI=8
-HOMEPAGE=https://tmuxp.git-pull.com
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/libtmux-0.11.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.11.1.tar.gz -> tmuxp-1.11.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f7fe76c137b6e465fb69ecb83fc6e875
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.12.1 b/metadata/md5-cache/app-misc/tmuxp-1.12.1
deleted file mode 100644
index 86fadb498751..000000000000
--- a/metadata/md5-cache/app-misc/tmuxp-1.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-rerunfailures-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/flaky ) test? ( >=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/libtmux-0.12.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=tmux session manager. built on libtmux
-EAPI=8
-HOMEPAGE=https://tmuxp.git-pull.com
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/libtmux-0.12.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.12.1.tar.gz -> tmuxp-1.12.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ade02e9f6928b47c554ffc567675e3a
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.13.0 b/metadata/md5-cache/app-misc/tmuxp-1.13.0
index be1714a8e613..e3eec4a93476 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.13.0
+++ b/metadata/md5-cache/app-misc/tmuxp-1.13.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://tmuxp.git-pull.com
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/libtmux-0.14*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.13.0.tar.gz -> tmuxp-1.13.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f830bf9cdc493f44a8aef56441d296ac
+_md5_=c123ac12cf47a24031bd12bbe67a547b
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.9.4 b/metadata/md5-cache/app-misc/tmuxp-1.9.4
deleted file mode 100644
index 56ab05d12bd9..000000000000
--- a/metadata/md5-cache/app-misc/tmuxp-1.9.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-rerunfailures-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/flaky ) test? ( >=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/libtmux-0.10.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=tmux session manager. built on libtmux
-EAPI=8
-HOMEPAGE=https://tmuxp.git-pull.com
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/libtmux-0.10.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.9.4.tar.gz -> tmuxp-1.9.4.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0b98014a6ce403744e53442cef6bc97e
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7611388924eb..cefb2afb3e22 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/paperwork-backend-2.1.0 b/metadata/md5-cache/app-text/paperwork-backend-2.1.0
index 5f5d30bc5965..0bf0a768d505 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.1.0
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.1.0
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Backend part of Paperwork (Python API, no UI)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
@@ -8,9 +8,9 @@ INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-2.1.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3de151396059d342a398efc9178a4807
+_md5_=d48b2f57034da1555601f51e6c4f4799
diff --git a/metadata/md5-cache/app-text/paperwork-backend-2.1.1 b/metadata/md5-cache/app-text/paperwork-backend-2.1.1
index 4b6f1cbc3e80..fc0058a71095 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.1.1
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.1.1
@@ -1,6 +1,6 @@
-BDEPEND=test? ( app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Backend part of Paperwork (Python API, no UI)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
@@ -8,10 +8,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/whoosh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-2.1.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=43918d8c0f9f1df42abbf5bce11325fa
+_md5_=ade45664ac2c3195cae9d2d0bccccc62
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 439182b4d4a6..08de6ff22a18 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/openssl-compat-0.9.8z_p8-r2 b/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
deleted file mode 100644
index d3e7e07cd296..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tls-compression? ( >=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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-0.9.8*:0 !dev-libs/openssl:0.9.8 >=dev-lang/perl-5 test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-INHERIT=flag-o-matic toolchain-funcs multilib-minimal
-IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test tls-compression abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=openssl
-RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tls-compression? ( >=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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-0.9.8*:0 !dev-libs/openssl:0.9.8
-RESTRICT=!bindist? ( bindist ) test
-SLOT=0.9.8
-SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=32b770d6f595428e634e704de003456e
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.2 b/metadata/md5-cache/dev-python/Levenshtein-0.12.2
index 4db99bc3eb4d..84d461c8a4bc 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
+++ b/metadata/md5-cache/dev-python/Levenshtein-0.12.2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=72db15a0291dcb05556019337cd7b84e
+_md5_=cea45f2da5f8d64162d104049126646b
diff --git a/metadata/md5-cache/dev-python/Levenshtein-0.20.3 b/metadata/md5-cache/dev-python/Levenshtein-0.20.3
new file mode 100644
index 000000000000..f1ff2163a399
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Levenshtein-0.20.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/rapidfuzz-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/rapidfuzz-cpp-1.0.4
+DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
+EAPI=8
+HOMEPAGE=https://pypi.org/project/Levenshtein/ https://github.com/maxbachmann/Levenshtein/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=<dev-python/rapidfuzz-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/Levenshtein/archive/v0.20.3.tar.gz -> Levenshtein-0.20.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2c3864b494667c4922baf59af2156664
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 626e5c7cbcb6..31e75549c35c 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/fuzzywuzzy-0.18.0 b/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
index 15ac9055c1f6..afe41ae5ffaa 100644
--- a/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
+++ b/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fuzzy string matching in python
 EAPI=7
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-python/python-levenshtein[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 )
+RDEPEND=dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fuzzywuzzy/fuzzywuzzy-0.18.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bd4fb7e49e23c2be92d17306f15ef6e6
+_md5_=2e146ae427110f4b053c53afa4dbe5ca
diff --git a/metadata/md5-cache/dev-python/libtmux-0.10.3 b/metadata/md5-cache/dev-python/libtmux-0.10.3
deleted file mode 100644
index acd3532134b7..000000000000
--- a/metadata/md5-cache/dev-python/libtmux-0.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twine[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-misc/tmux-3.0a >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=python api for tmux
-EAPI=8
-HOMEPAGE=https://libtmux.git-pull.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.10.3.tar.gz -> libtmux-v0.10.3.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ef39fb0c522d47df5980b15777e50ef9
diff --git a/metadata/md5-cache/dev-python/libtmux-0.11.0 b/metadata/md5-cache/dev-python/libtmux-0.11.0
deleted file mode 100644
index e5eae9a9459c..000000000000
--- a/metadata/md5-cache/dev-python/libtmux-0.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-misc/tmux-3.0a >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=python api for tmux
-EAPI=8
-HOMEPAGE=https://libtmux.git-pull.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.11.0.tar.gz -> libtmux-v0.11.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=30ad5678c652b7e0c6ab73fa533a0351
diff --git a/metadata/md5-cache/dev-python/libtmux-0.12.0 b/metadata/md5-cache/dev-python/libtmux-0.12.0
deleted file mode 100644
index 12f9b70150d8..000000000000
--- a/metadata/md5-cache/dev-python/libtmux-0.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-misc/tmux-3.0a >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=python api for tmux
-EAPI=8
-HOMEPAGE=https://libtmux.git-pull.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.12.0.tar.gz -> libtmux-0.12.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=76fee395abf505980c6501b6b312f087
diff --git a/metadata/md5-cache/dev-python/libtmux-0.13.0 b/metadata/md5-cache/dev-python/libtmux-0.13.0
deleted file mode 100644
index 94467973af30..000000000000
--- a/metadata/md5-cache/dev-python/libtmux-0.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-misc/tmux-3.0a >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=python api for tmux
-EAPI=8
-HOMEPAGE=https://libtmux.git-pull.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.13.0.tar.gz -> libtmux-0.13.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=71782a411cc05ec0228804c9d548c4d9
diff --git a/metadata/md5-cache/dev-python/linkify-it-py-2.0.0 b/metadata/md5-cache/dev-python/linkify-it-py-2.0.0
new file mode 100644
index 000000000000..06597c779734
--- /dev/null
+++ b/metadata/md5-cache/dev-python/linkify-it-py-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/uc-micro-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Links recognition library with full unicode support
+EAPI=8
+HOMEPAGE=https://github.com/tsutsu3/linkify-it-py/ https://pypi.org/project/linkify-it-py/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc
+LICENSE=MIT
+RDEPEND=dev-python/uc-micro-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tsutsu3/linkify-it-py/archive/v2.0.0.tar.gz -> linkify-it-py-2.0.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=83aa0f7d8d54f319ecd6a012de08457c
diff --git a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2 b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2
new file mode 100644
index 000000000000..a47806009ea1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/linkify-it-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of markdown-it, Markdown parser
+EAPI=8
+HOMEPAGE=https://pypi.org/project/markdown-it-py/ https://github.com/executablebooks/markdown-it-py/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc
+LICENSE=MIT
+RDEPEND=dev-python/linkify-it-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/executablebooks/markdown-it-py/archive/v2.1.0.tar.gz -> markdown-it-py-2.1.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=45de26ebbb1cc6817a18b122b2790703
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.7 b/metadata/md5-cache/dev-python/minidb-2.0.7
new file mode 100644
index 000000000000..5bf4815beaba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/minidb-2.0.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple SQLite-based object store
+EAPI=8
+HOMEPAGE=https://thp.io/2010/minidb/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/minidb/minidb-2.0.7.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1a9f560f9241e9587229bda33abb3c54
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.0 b/metadata/md5-cache/dev-python/snakeoil-0.10.0
new file mode 100644
index 000000000000..23efa2cbc89c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD BSD-2 MIT
+RDEPEND=dev-python/lazy-object-proxy[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=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=be8edcb77aa7a9547120f959522a8eca
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index d896cc4a5c69..e49d8ba185d9 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=misc common functionality and useful optimizations
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=82bd07f603464339d13fc3756db98c9b
+_md5_=be8edcb77aa7a9547120f959522a8eca
diff --git a/metadata/md5-cache/dev-python/tempest-32.0.0 b/metadata/md5-cache/dev-python/tempest-32.0.0
new file mode 100644
index 000000000000..6788768a1f86
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tempest-32.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stestr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenStack Integration Testing
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/ https://launchpad.net/tempest/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tempest/tempest-32.0.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d8788ea9a9c32fcd33d4b109ede9fb50
diff --git a/metadata/md5-cache/dev-python/textdistance-4.3.0 b/metadata/md5-cache/dev-python/textdistance-4.3.0
index 7c411f23de96..b8b921ce3a60 100644
--- a/metadata/md5-cache/dev-python/textdistance-4.3.0
+++ b/metadata/md5-cache/dev-python/textdistance-4.3.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/abydos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jellyfish[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyxDamerauLevenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/abydos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jellyfish[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyxDamerauLevenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Compute distance between the two texts
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/life4/textdistance/archive/4.3.0.tar.gz -> textdistance-4.3.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c211eb2784c6c07e020bd3eb27294fbf
+_md5_=453f8637b581f1963ffbb8924d8c6d00
diff --git a/metadata/md5-cache/dev-python/textdistance-4.4.0 b/metadata/md5-cache/dev-python/textdistance-4.4.0
index 6d35a0384b29..7d3221e19cfb 100644
--- a/metadata/md5-cache/dev-python/textdistance-4.4.0
+++ b/metadata/md5-cache/dev-python/textdistance-4.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/abydos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jellyfish[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyxDamerauLevenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=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(-)?]
+BDEPEND=test? ( dev-python/abydos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jellyfish[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyxDamerauLevenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=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=Compute distance between the two texts
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/life4/textdistance/archive/4.4.0.tar.gz -> textdistance-4.4.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c6bbad7bb40a513c5840f6baf6f9bbdc
+_md5_=d0ed29c6321dbc9360a936438a85b4d3
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.7.2 b/metadata/md5-cache/dev-python/translate-toolkit-3.7.2
index 31bfe9675642..c7a6c2ac2250 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.7.2
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[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[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[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[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Toolkit to convert between many translation formats
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
-RDEPEND=!dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/3.7.2.tar.gz -> translate-3.7.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1dc5870ca2ca066199a8f7572d5962c5
+_md5_=c3e3c070dc1adaca6ae59a71355d7631
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.7.3 b/metadata/md5-cache/dev-python/translate-toolkit-3.7.3
index 1984f159d568..fe7dc95d3de0 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.7.3
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.7.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[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[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[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[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Toolkit to convert between many translation formats
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=!dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/3.7.3.tar.gz -> translate-3.7.3.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=202d4b41673308aff44c1eb1e51202b3
+_md5_=38fd9ae243f34120973cde0efa5d4791
diff --git a/metadata/md5-cache/dev-python/uc-micro-py-1.0.1 b/metadata/md5-cache/dev-python/uc-micro-py-1.0.1
new file mode 100644
index 000000000000..3dfaa738ac03
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uc-micro-py-1.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Micro subset of unicode data files for linkify-it-py projects
+EAPI=8
+HOMEPAGE=https://github.com/tsutsu3/uc.micro-py/ https://pypi.org/project/uc-micro-py/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tsutsu3/uc.micro-py/archive/v1.0.1.tar.gz -> uc.micro-py-1.0.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bb6ceb220ed9b43d4237adf7bf99d5b3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ce5e1899e6e3..ef7781571ce8 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/tree-sitter-cli-0.20.7 b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
index 0b37f14f895a..bc613f42aaf0 100644
--- a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
+++ b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=Apache-2.0 BSD-2 CC0-1.0 ISC MIT
 RDEPEND=~dev-libs/tree-sitter-0.20.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.7.tar.gz -> tree-sitter-0.20.7.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/ascii/1.0.0/download -> ascii-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/html-escape/0.2.6/download -> html-escape-0.2.6.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.48/download -> js-sys-0.3.48.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.0/download -> once_cell-1.7.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.7.2/download -> pretty_assertions-0.7.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.3/download -> regex-1.4.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/1.0.5/download -> semver-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.63/download -> serde_json-1.0.63.crate https://crates.io/api/v1/crates/smallbitvec/2.5.1/download -> smallbitvec-2.5.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.67/download -> syn-1.0.67.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tiny_http/0.8.0/download -> tiny_http-0.8.0.crate https://crates.io/api/v1/crates/tinyvec/1.1.1/download -> tinyvec-1.1.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/utf8-width/0.1.4/download -> utf8-width-0.1.4.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.71/download -> wasm-bindgen-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.71/download -> wasm-bindgen-backend-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.71/download -> wasm-bindgen-macro-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.71/download -> wasm-bindgen-macro-support-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.71/download -> wasm-bindgen-shared-0.2.71.crate https://crates.io/api/v1/crates/web-sys/0.3.48/download -> web-sys-0.3.48.crate https://crates.io/api/v1/crates/webbrowser/0.5.5/download -> webbrowser-0.5.5.crate https://crates.io/api/v1/crates/which/4.1.0/download -> which-4.1.0.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=18b89d8a246dd441b75059c3f3ae1874
+_md5_=491a0dfd339170ef81f57fc3cd883eeb
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 37fdd72a9f8b..ba6c3539a63e 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/gif2apng-1.9-r1 b/metadata/md5-cache/media-gfx/gif2apng-1.9-r1
deleted file mode 100644
index 35148ce83ac8..000000000000
--- a/metadata/md5-cache/media-gfx/gif2apng-1.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib app-arch/zopfli:= app-arch/unzip
-DESCRIPTION=create an APNG from a GIF
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/gif2apng/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB LGPL-2.1
-RDEPEND=sys-libs/zlib app-arch/zopfli:=
-SLOT=0
-SRC_URI=mirror://sourceforge/gif2apng/1.9/gif2apng-1.9-src.zip
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a616359bbd90aa1401fe670518ff4107
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 56f006f15f4a..5093a6c2ac6c 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libaacplus-2.0.2-r3 b/metadata/md5-cache/media-libs/libaacplus-2.0.2-r3
deleted file mode 100644
index 8bd911ab4270..000000000000
--- a/metadata/md5-cache/media-libs/libaacplus-2.0.2-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!media-sound/aacplusenc fftw? ( >=sci-libs/fftw-3.3.3-r2: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(-)?] )
-DESCRIPTION=HE-AAC+ v2 library, based on the reference implementation
-EAPI=7
-HOMEPAGE=http://tipok.org.ua/node/17
-INHERIT=autotools multilib-minimal
-IUSE=fftw static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=!media-sound/aacplusenc fftw? ( >=sci-libs/fftw-3.3.3-r2: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(-)?] )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://tipok.org.ua/downloads/media/aacplus/libaacplus/libaacplus-2.0.2.tar.gz https://dev.gentoo.org/~aballier/libaacplus-2.0.2.tar.gz http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8a1a65b30db911d025c6114c4941bf36
diff --git a/metadata/md5-cache/media-libs/libbluray-1.3.2 b/metadata/md5-cache/media-libs/libbluray-1.3.2
index 747a5a377184..2e5875a017ad 100644
--- a/metadata/md5-cache/media-libs/libbluray-1.3.2
+++ b/metadata/md5-cache/media-libs/libbluray-1.3.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.videolan.org/developers/libbluray.html
 INHERIT=autotools java-pkg-opt-2 multilib-minimal
 IUSE=aacs bdplus +fontconfig java +truetype utils +xml java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libudfread[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/2
 SRC_URI=https://downloads.videolan.org/pub/videolan/libbluray/1.3.2/libbluray-1.3.2.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d48f70a3f9c1888761510ce47553bfc6
+_md5_=81e0923fef722b0749da3859e8eb879e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 308d05ad54c5..ef4437174913 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/amsynth-1.13.0 b/metadata/md5-cache/media-sound/amsynth-1.13.0
index 472a3df7e404..af893d6fcc50 100644
--- a/metadata/md5-cache/media-sound/amsynth-1.13.0
+++ b/metadata/md5-cache/media-sound/amsynth-1.13.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/amsynth/amsynth
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg
 IUSE=alsa dssi gtk jack lash lv2 nsm oss vst
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib:= media-sound/alsa-utils ) dssi? ( media-libs/dssi:= media-libs/liblo:= ) gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) jack? ( virtual/jack ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
 REQUIRED_USE=dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/amsynth/amsynth/releases/download/release-1.13.0/amsynth-1.13.0.tar.gz
 _eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=786732a310230f2df749e4292a835e46
+_md5_=8e02a4c8d50c38a12fa074154818cb2f
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.27-r1 b/metadata/md5-cache/media-sound/qtractor-0.9.27-r1
index 69fd3c766216..045db9cc0212 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.9.27-r1
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.27-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://qtractor.sourceforge.io
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
 IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dssi? ( ladspa )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.27.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4f4633c3c075a28dcdfc48df8e8d1b43
+_md5_=682e9967e6a333ce60aeb0787c9a513e
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b779b0b54660..c77585c914b2 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r3 b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r3
deleted file mode 100644
index 29cacb91fd78..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=acct-group/sguil acct-user/sguil
-DESCRIPTION=Sensor part of sguil Network Security Monitoring
-EAPI=7
-HOMEPAGE=https://github.com/bammv/sguil
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 GPL-2+ QPL-1.0 GPL-2
-RDEPEND=acct-group/sguil acct-user/sguil >=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tls >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml:= net-analyzer/sancp
-SLOT=0
-SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz
-_md5_=e6af0c29d66b8ca1adb7da039d0827e2
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1 b/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1
deleted file mode 100644
index b2a2ec8ae17d..000000000000
--- a/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=acct-group/smokeping acct-user/smokeping >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius )
-DESCRIPTION=A powerful latency measurement tool
-EAPI=7
-HOMEPAGE=https://oss.oetiker.ch/smokeping/
-INHERIT=autotools systemd tmpfiles
-IUSE=apache2 curl dig echoping ipv6 radius
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=acct-group/smokeping acct-user/smokeping >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://oss.oetiker.ch/smokeping/pub/smokeping-2.7.3.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=be85e8c26c7a3c29a6a17b8ed405e776
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 7d4e38b96e63..10f9f57811e2 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/calico-cni-plugin-3.1.3 b/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
deleted file mode 100644
index 0f9a0d5e4c1b..000000000000
--- a/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Calico Networking for CNI
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/cni-plugin
-INHERIT=golang-vcs-snapshot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-containers/cni-plugins
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/projectcalico/cni-plugin/archive/v3.1.3.tar.gz -> calico-cni-plugin-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz -> github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz https://github.com/containernetworking/plugins/archive/7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz -> github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/coreos/go-iptables/archive/b5b1876b170881a8259f036445ee89c8669db386.tar.gz -> github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/felix/archive/fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz -> github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz https://github.com/golang/crypto/archive/1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz -> github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/076b546753157f758b316e59bcb51e6807c04057.tar.gz -> github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
-_md5_=ba50f519f9b3fe812e47a00accbd16ab
diff --git a/metadata/md5-cache/net-misc/calicoctl-3.1.3 b/metadata/md5-cache/net-misc/calicoctl-3.1.3
deleted file mode 100644
index 3ef4c871602c..000000000000
--- a/metadata/md5-cache/net-misc/calicoctl-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI to manage Calico network and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/calicoctl
-INHERIT=golang-vcs-snapshot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/calicoctl/archive/v3.1.3.tar.gz -> calicoctl-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz -> github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz -> github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/influxdata/influxdb/archive/0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz -> github.com-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/magiconair/properties/archive/c2353362d570a7bfa228149c62842019201cfb71.tar.gz -> github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-runewidth/archive/ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz -> github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/mapstructure/archive/bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz -> github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz https://github.com/olekukonko/tablewriter/archive/d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz -> github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/pelletier/go-toml/archive/66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz -> github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/afero/archive/63644898a8da0bc22138abf860edaf5277b6102e.tar.gz -> github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/spf13/viper/archive/15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz -> github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
-_md5_=d08ad9cd19694d04d29027157df140c8
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.5 b/metadata/md5-cache/net-misc/keychain-2.8.5
deleted file mode 100644
index 6bf863012ef7..000000000000
--- a/metadata/md5-cache/net-misc/keychain-2.8.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-EAPI=6
-HOMEPAGE=https://www.funtoo.org/Keychain
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/funtoo/keychain/archive/2.8.5.tar.gz -> keychain-2.8.5.tar.gz
-_md5_=4583d124bbb145da3c64d55cba69812d
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 63cd1f40101e..14d544c904ef 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/gsmartcontrol-1.1.3 b/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
deleted file mode 100644
index d47f92406188..000000000000
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools virtual/pkgconfig test? ( dev-util/gtk-builder-convert )
-DESCRIPTION=Hard disk drive health inspection tool
-EAPI=6
-HOMEPAGE=https://gsmartcontrol.sourceforge.io/
-INHERIT=flag-o-matic gnome2-utils
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools x11-apps/xmessage
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/gsmartcontrol/gsmartcontrol-1.1.3.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2204079df105d67ec374ee194c36606b
diff --git a/metadata/md5-cache/sys-apps/minised-1.15 b/metadata/md5-cache/sys-apps/minised-1.15
deleted file mode 100644
index c1952a7b9eb8..000000000000
--- a/metadata/md5-cache/sys-apps/minised-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=a smaller, cheaper and faster sed implementation
-EAPI=6
-HOMEPAGE=http://www.exactcode.de/oss/minised/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://dl.exactcode.de/oss/minised/minised-1.15.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f2602f23d62f495ba5b050220e1b48ff
diff --git a/metadata/md5-cache/sys-apps/systemd-251.2 b/metadata/md5-cache/sys-apps/systemd-251.2
deleted file mode 100644
index 0c2b5be7ca50..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-251.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=http://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.2/systemd-stable-251.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=387e35a1d6275af15550adeeb4db27bf
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-250.7 b/metadata/md5-cache/sys-apps/systemd-utils-250.7
deleted file mode 100644
index e5bacf7e31e7..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-utils-250.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext 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 prepare setup test
-DEPEND=selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( >=sys-boot/gnu-efi-3.0.2 ) >=sys-kernel/linux-headers-3.11
-DESCRIPTION=Utilities split out from systemd for OpenRC users
-EAPI=8
-HOMEPAGE=https://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
-RDEPEND=selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
-REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v250.7.tar.gz -> systemd-stable-250.7.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-250.4.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=149f9a0a5b1a0e9993863da428ccb1a5
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-250.8 b/metadata/md5-cache/sys-apps/systemd-utils-250.8
deleted file mode 100644
index 55a5daf38393..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-utils-250.8
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext 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 prepare setup test
-DEPEND=selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( >=sys-boot/gnu-efi-3.0.2 ) >=sys-kernel/linux-headers-3.11
-DESCRIPTION=Utilities split out from systemd for OpenRC users
-EAPI=8
-HOMEPAGE=https://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
-RDEPEND=selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
-REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v250.8.tar.gz -> systemd-stable-250.8.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-250.4.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=52a3e5b9935112b6b65e933364d04ef0
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.2-r1 b/metadata/md5-cache/sys-apps/systemd-utils-251.2-r1
deleted file mode 100644
index 58ed17773826..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-utils-251.2-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext 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 prepare setup test
-DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=Utilities split out from systemd for OpenRC users
-EAPI=8
-HOMEPAGE=https://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
-RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
-REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.2.tar.gz -> systemd-stable-251.2.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=36046012ea2d2c4d9f4ebc0c7bb3b7bc
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.3 b/metadata/md5-cache/sys-apps/systemd-utils-251.3
deleted file mode 100644
index 80a3662443fb..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-utils-251.3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext 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 prepare setup test
-DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=Utilities split out from systemd for OpenRC users
-EAPI=8
-HOMEPAGE=https://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
-RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
-REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.3.tar.gz -> systemd-stable-251.3.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=23002e102c2e7b3ecea1ee5d7dd6adbb
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.4 b/metadata/md5-cache/sys-apps/systemd-utils-251.4
deleted file mode 100644
index 7fe8ded9c345..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-utils-251.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext 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 prepare setup test
-DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=Utilities split out from systemd for OpenRC users
-EAPI=8
-HOMEPAGE=https://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
-RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
-REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.4.tar.gz -> systemd-stable-251.4.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=b3d86cfc8d08205c6874088f3570aa26
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.4-r1 b/metadata/md5-cache/sys-apps/systemd-utils-251.4-r2
index 920a3916a6eb..6f8d7ea38638 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-251.4-r1
+++ b/metadata/md5-cache/sys-apps/systemd-utils-251.4-r2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.4.tar.gz -> systemd-stable-251.4.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=ff85ea25d9427494581041351e188ac3
+_md5_=bceab9dc8d9f27bc823f391497c526f0
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 508ebc932074..f54441ad1e42 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/kube-apiserver-1.22.14 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.14
new file mode 100644
index 000000000000..f061cc49f354
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.14
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.14.tar.gz -> kubernetes-1.22.14.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=89fa9836c3db65885a60d2efda5c3d67
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.10 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.10
index 007c9a14c324..d409b20c9370 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.10
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.10.tar.gz -> kubernetes-1.23.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=96f2f40b22c5538a7288b51733848246
+_md5_=0e2bb4b645b1ad8006c74b2e4046b775
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.11
index eef491afc499..7a5c9b50c0c8 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.11
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.11.tar.gz -> kubernetes-1.23.11.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0e2bb4b645b1ad8006c74b2e4046b775
+_md5_=96f2f40b22c5538a7288b51733848246
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.4 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.4
index 19c4a2b6ae11..6e3d4c267b41 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.4
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.4.tar.gz -> kubernetes-1.24.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=893bcdb912eb65b8fe820892509f6287
+_md5_=0ecbfd978938bb1ff79da475abd4b596
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.5
index ce8ef998ceec..b00e624ed290 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.5.tar.gz -> kubernetes-1.24.5.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ecbfd978938bb1ff79da475abd4b596
+_md5_=893bcdb912eb65b8fe820892509f6287
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.14 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.14
new file mode 100644
index 000000000000..6cf741d1929e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.14
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.14.tar.gz -> kubernetes-1.22.14.tar.gz
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
+_md5_=b2de9b053f81cbd49c92269a10084a0e
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.10 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.10
index 51b2f08f8406..fefc09c61c63 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.10
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.10.tar.gz -> kubernetes-1.23.10.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=7c5d50a549ed10a54110d5aae5a0f94b
+_md5_=589d1d8ccc235a4ebf4c58f085a6d34c
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.11
index 0969dcd11225..cdf4eccafdfc 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.11
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.11.tar.gz -> kubernetes-1.23.11.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=589d1d8ccc235a4ebf4c58f085a6d34c
+_md5_=7c5d50a549ed10a54110d5aae5a0f94b
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.4 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.4
index 29e73cb0dc76..3ac7951c4af9 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.4
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.4.tar.gz -> kubernetes-1.24.4.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=d2956d962cf75e7f87969dacc801597f
+_md5_=5d3baf739f712a82d222abe23a4914ef
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.5
index 30650b13ead8..9e6ba6d0b2e4 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.5.tar.gz -> kubernetes-1.24.5.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=5d3baf739f712a82d222abe23a4914ef
+_md5_=d2956d962cf75e7f87969dacc801597f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.14 b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.14
new file mode 100644
index 000000000000..a9936b4c1d8e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.14
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.14.tar.gz -> kubernetes-1.22.14.tar.gz
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
+_md5_=e26b6327c24c068cc57a04cc4194325d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.10 b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.10
index 1c2d0f596290..6bfb841be6ee 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.10
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.10
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.10.tar.gz -> kubernetes-1.23.10.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=4ceab05f6dafa180eb2d3d9821f660e8
+_md5_=c17434a82e6c2af19743bdb7c0821799
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9 b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.11
index 4e1951cd68ff..5725268e2797 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.11
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.11.tar.gz -> kubernetes-1.23.11.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=c17434a82e6c2af19743bdb7c0821799
+_md5_=4ceab05f6dafa180eb2d3d9821f660e8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.4 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.4
index 0a4c7216b8c7..b207e12a2e7e 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.4
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.4
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.4.tar.gz -> kubernetes-1.24.4.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=d6cc245cbbbaeefb53b1de213061689e
+_md5_=bd9f144a2699058397862de61a2e6847
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.5
index 03d8501d91ae..c08cf6071672 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.5
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.5.tar.gz -> kubernetes-1.24.5.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=bd9f144a2699058397862de61a2e6847
+_md5_=d6cc245cbbbaeefb53b1de213061689e
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.14 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.14
new file mode 100644
index 000000000000..5462d45f6dfa
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.14
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.14.tar.gz -> kubernetes-1.22.14.tar.gz
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
+_md5_=1f4a53ca7f0fee1dda2eedadbb74eb9f
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.10 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.10
index 5066dbba8c30..69ca3beee5e7 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.10
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.10.tar.gz -> kubernetes-1.23.10.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=e8827078bfa0531fac0ba86c94a8fc02
+_md5_=893906f2c9933daf3a11474a43d60503
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.11
index 8505afc6804c..756f2dbdbc6b 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.11
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.11.tar.gz -> kubernetes-1.23.11.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=893906f2c9933daf3a11474a43d60503
+_md5_=e8827078bfa0531fac0ba86c94a8fc02
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.4 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.4
index b42b4c26fae2..02f6eb5d39e3 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.4
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.4.tar.gz -> kubernetes-1.24.4.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=82db5e596b7bc69f33565bf7aa29c22d
+_md5_=285d3b044dc198f1e84a6f95f328c563
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.5
index dd3f1cd25b53..360fdf67cbc8 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.5.tar.gz -> kubernetes-1.24.5.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=285d3b044dc198f1e84a6f95f328c563
+_md5_=82db5e596b7bc69f33565bf7aa29c22d
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.22.14 b/metadata/md5-cache/sys-cluster/kubeadm-1.22.14
new file mode 100644
index 000000000000..fbe129fc64ad
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.22.14
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.14.tar.gz -> kubernetes-1.22.14.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=61607ca439c903a945818ba8317c2704
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.10 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.10
index 03852ddfc93f..c0172a967694 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.23.10
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.23.10
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.10.tar.gz -> kubernetes-1.23.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=de36be3af9385a90061f2a1a8c15e201
+_md5_=96ccbcc518727dbf6a5fd42cc4278386
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.9 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.11
index 1cffbc346ab3..7fd85d7526ce 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.23.11
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.11.tar.gz -> kubernetes-1.23.11.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=96ccbcc518727dbf6a5fd42cc4278386
+_md5_=de36be3af9385a90061f2a1a8c15e201
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.4 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.4
index 1478a9a3dff5..4d6921ba2520 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.4
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.24.4
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.4.tar.gz -> kubernetes-1.24.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7818fe291a2a9583eba583dd06c81d4a
+_md5_=8c8760eff4c0e49d2ff34a43cd946a41
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.3 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.5
index 54ff2290363e..9887cf63c046 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.24.5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.5.tar.gz -> kubernetes-1.24.5.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8c8760eff4c0e49d2ff34a43cd946a41
+_md5_=7818fe291a2a9583eba583dd06c81d4a
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.22.14 b/metadata/md5-cache/sys-cluster/kubectl-1.22.14
new file mode 100644
index 000000000000..7e61076c9fad
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.22.14
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.14.tar.gz -> kubernetes-1.22.14.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5f594a399c4ae6a9e86ab239101ab9c9
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.23.10 b/metadata/md5-cache/sys-cluster/kubectl-1.23.10
index 3f8e82acfad4..bd8f9699fa5f 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.23.10
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.23.10
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.10.tar.gz -> kubernetes-1.23.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=88c58e69ec38a9111b1b4fbad171d56c
+_md5_=a23e8aae87642a507f622651a93f63ea
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.23.9 b/metadata/md5-cache/sys-cluster/kubectl-1.23.11
index 60541af6b089..1938d5979c9a 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.23.11
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.11.tar.gz -> kubernetes-1.23.11.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a23e8aae87642a507f622651a93f63ea
+_md5_=88c58e69ec38a9111b1b4fbad171d56c
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.4 b/metadata/md5-cache/sys-cluster/kubectl-1.24.4
index f81525025991..d5bf8f546af1 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.4
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.24.4
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.4.tar.gz -> kubernetes-1.24.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=93c8067665939eba64dcb34235370972
+_md5_=4826db9b81b2cacf7c1b73ddc0599718
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.3 b/metadata/md5-cache/sys-cluster/kubectl-1.24.5
index 5bbf2930c795..5bbfeb672e20 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.24.5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.5.tar.gz -> kubernetes-1.24.5.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4826db9b81b2cacf7c1b73ddc0599718
+_md5_=93c8067665939eba64dcb34235370972
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.22.14 b/metadata/md5-cache/sys-cluster/kubelet-1.22.14
new file mode 100644
index 000000000000..92d8171d7321
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.22.14
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.14.tar.gz -> kubernetes-1.22.14.tar.gz
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3ff3b4106bb9c945d2764d28836e9599
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.23.10 b/metadata/md5-cache/sys-cluster/kubelet-1.23.10
index fb7401fff242..aff2f88744d0 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.23.10
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.23.10
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.10.tar.gz -> kubernetes-1.23.10.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3690c5e2bd5039cdc7ab2505e5cc3495
+_md5_=1914a810ccc022d2444725d30df263c1
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.23.9 b/metadata/md5-cache/sys-cluster/kubelet-1.23.11
index a3956984637c..a0a756dc740c 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.23.11
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.11.tar.gz -> kubernetes-1.23.11.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1914a810ccc022d2444725d30df263c1
+_md5_=3690c5e2bd5039cdc7ab2505e5cc3495
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.4 b/metadata/md5-cache/sys-cluster/kubelet-1.24.4
index a2f4dd0d045b..66045e8cc1b0 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.4
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.24.4
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.4.tar.gz -> kubernetes-1.24.4.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aff9f5cfa6fc6bc66372379a4f5f8f66
+_md5_=3f011fe78ea4d4708099f43dd1ca0b58
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.3 b/metadata/md5-cache/sys-cluster/kubelet-1.24.5
index cea5ea181d76..257e3400e259 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.24.5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=amd64 ~arm64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.5.tar.gz -> kubernetes-1.24.5.tar.gz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3f011fe78ea4d4708099f43dd1ca0b58
+_md5_=aff9f5cfa6fc6bc66372379a4f5f8f66
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 1342a4dcdfb4..3e9e6cc4ff4a 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/glibc-2.35-r10 b/metadata/md5-cache/sys-libs/glibc-2.35-r10
index 58ee7ddd3d79..a46759dfefe7 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.35-r10
+++ b/metadata/md5-cache/sys-libs/glibc-2.35-r10
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet +clone3 compile-locales +crypt custom-cflags doc experimental-loong gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~m68k
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-11.tar.xz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0f35fa54205caad6150b7cf26b26f3d9
+_md5_=54f5c51c443eaa455ea60692fff0d774
diff --git a/metadata/md5-cache/sys-libs/liburing-2.2 b/metadata/md5-cache/sys-libs/liburing-2.2
index c1d2e174e8af..ef2b894b6f6c 100644
--- a/metadata/md5-cache/sys-libs/liburing-2.2
+++ b/metadata/md5-cache/sys-libs/liburing-2.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/axboe/liburing
 INHERIT=multilib-minimal toolchain-funcs
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86
 LICENSE=MIT
 RDEPEND=>=sys-kernel/linux-headers-5.1
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://git.kernel.dk/cgit/liburing/snapshot/liburing-2.2.tar.bz2
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=328aa0ba63e1272b7c71766e09b706eb
+_md5_=0d012c105555ef109903483c19788c5c
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 4ae81a995592..f78c2f9d1063 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5112.101 b/metadata/md5-cache/www-client/chromium-104.0.5112.101
index 907ab982b56f..fe2a7be6f22b 100644
--- a/metadata/md5-cache/www-client/chromium-104.0.5112.101
+++ b/metadata/md5-cache/www-client/chromium-104.0.5112.101
@@ -1,4 +1,4 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Open-source version of Google Chrome web browser
@@ -13,4 +13,4 @@ REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headles
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.101.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c999620b1a7bef888b2c3fd7b2992a25
+_md5_=0a4a7497e08e13e3ebd2523fbb183abd
diff --git a/metadata/md5-cache/www-client/chromium-105.0.5195.102 b/metadata/md5-cache/www-client/chromium-105.0.5195.102
index e235d5fa46a0..d7abf8aa5cdb 100644
--- a/metadata/md5-cache/www-client/chromium-105.0.5195.102
+++ b/metadata/md5-cache/www-client/chromium-105.0.5195.102
@@ -1,4 +1,4 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Open-source version of Google Chrome web browser
@@ -13,4 +13,4 @@ REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headles
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-105.0.5195.102.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-105-patchset-1/chromium-105-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=47286a604426d1f90863495f2aff5346
+_md5_=fe020116b34e9bf1da5f6d3d62274f28
diff --git a/metadata/md5-cache/www-client/chromium-105.0.5195.52 b/metadata/md5-cache/www-client/chromium-105.0.5195.52
index 0bd6e62daa54..0a55ec367bdc 100644
--- a/metadata/md5-cache/www-client/chromium-105.0.5195.52
+++ b/metadata/md5-cache/www-client/chromium-105.0.5195.52
@@ -1,4 +1,4 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Open-source version of Google Chrome web browser
@@ -13,4 +13,4 @@ REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headles
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-105.0.5195.52.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-105-patchset-1/chromium-105-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=56c08736420cbb78b6a7cb44a30736c2
+_md5_=86829c101bcd1946ba234da6d61c5d28
diff --git a/metadata/md5-cache/www-client/chromium-106.0.5249.12 b/metadata/md5-cache/www-client/chromium-106.0.5249.12
index eda3a0ff7700..df70b2a9823d 100644
--- a/metadata/md5-cache/www-client/chromium-106.0.5249.12
+++ b/metadata/md5-cache/www-client/chromium-106.0.5249.12
@@ -1,4 +1,4 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Open-source version of Google Chrome web browser
@@ -13,4 +13,4 @@ REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headles
 SLOT=0/dev
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-106.0.5249.12.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-106-patchset-1/chromium-106-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d815d0ce714ed3c4bec3368dbb644b33
+_md5_=6dc9b7d5a1005c30768726e60edbd4e1
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.30 b/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.40
index 5a220b5a5bb0..a3965762abcb 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.30
+++ b/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.40
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.30-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.40-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7bb93e46b5176068deb7b8a0c24a0e9e
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-107.0.5286.2 b/metadata/md5-cache/www-client/google-chrome-unstable-107.0.5300.0
index dc57f4abbd16..044502e8d786 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-107.0.5286.2
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-107.0.5300.0
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_107.0.5286.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_107.0.5300.0-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7bb93e46b5176068deb7b8a0c24a0e9e
diff --git a/metadata/md5-cache/www-client/microsoft-edge-105.0.1343.33 b/metadata/md5-cache/www-client/microsoft-edge-105.0.1343.42
index f37a1ea19263..4822f2ce80a9 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-105.0.1343.33
+++ b/metadata/md5-cache/www-client/microsoft-edge-105.0.1343.42
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_105.0.1343.33-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_105.0.1343.42-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3301d61577802771b104ca2c26903a47
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-105.0.1343.23 b/metadata/md5-cache/www-client/microsoft-edge-beta-106.0.1370.15
index ace903965019..3426af537f86 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-105.0.1343.23
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-106.0.1370.15
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_105.0.1343.23-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_106.0.1370.15-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-105.0.1343.27 b/metadata/md5-cache/www-client/microsoft-edge-beta-106.0.1370.17
index 9cfe1391ebb2..317edca1279e 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-105.0.1343.27
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-106.0.1370.17
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_105.0.1343.27-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_106.0.1370.17-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index b787bbd7fe1c..3d67f3615b43 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.30_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.40_beta
index 4583d1849c2a..99304a814225 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.30_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.40_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.30-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.40-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5286.2_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5300.0_alpha
index 865d3c8ab7ce..d06bab262068 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5286.2_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5300.0_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_107.0.5286.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_107.0.5300.0-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index e50cf489fb67..662832bf2d9a 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/thttpd-2.27.1-r2 b/metadata/md5-cache/www-servers/thttpd-2.27.1-r2
deleted file mode 100644
index ba05e7641b0e..000000000000
--- a/metadata/md5-cache/www-servers/thttpd-2.27.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
-DESCRIPTION=Fork of thttpd, a small, fast, multiplexing webserver
-EAPI=7
-HOMEPAGE=https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd
-INHERIT=autotools flag-o-matic toolchain-funcs
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
-SLOT=0
-SRC_URI=https://github.com/blueness/sthttpd/archive/v2.27.1.tar.gz -> thttpd-2.27.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d20b0edfe918a8c75fd8b379b7a8f8a4
diff --git a/metadata/md5-cache/www-servers/thttpd-9999 b/metadata/md5-cache/www-servers/thttpd-9999
deleted file mode 100644
index 963fbb27951d..000000000000
--- a/metadata/md5-cache/www-servers/thttpd-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
-DESCRIPTION=Fork of thttpd, a small, fast, multiplexing webserver
-EAPI=7
-HOMEPAGE=https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd
-INHERIT=autotools flag-o-matic toolchain-funcs git-r3
-LICENSE=BSD GPL-2
-PROPERTIES=live
-RDEPEND=acct-group/thttpd acct-user/thttpd virtual/libcrypt:=
-SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ded99a9ec85fa1714eb7f4789aad8b50
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 03329a23b24b..6832f33f1c00 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/wmmoonclock-1.29 b/metadata/md5-cache/x11-plugins/wmmoonclock-1.29
deleted file mode 100644
index 2a9719cebea1..000000000000
--- a/metadata/md5-cache/x11-plugins/wmmoonclock-1.29
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
-DESCRIPTION=dockapp that shows lunar ephemeris to a high accuracy
-EAPI=6
-HOMEPAGE=https://www.dockapps.net/wmmoonclock
-KEYWORDS=amd64 ~mips ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmmoonclock-1.29.tar.gz
-_md5_=8b51b7e54e7e98b99f49cc9b65021d6c
diff --git a/metadata/md5-cache/x11-plugins/wmmoonclock-1.30 b/metadata/md5-cache/x11-plugins/wmmoonclock-1.30
index 4a3a6725e066..db3751316b59 100644
--- a/metadata/md5-cache/x11-plugins/wmmoonclock-1.30
+++ b/metadata/md5-cache/x11-plugins/wmmoonclock-1.30
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=dockapp that shows lunar ephemeris to a high accuracy
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmmoonclock
-KEYWORDS=amd64 ~mips ~ppc ~sparc x86
+KEYWORDS=amd64 ~mips ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmmoonclock-1.30.tar.gz
-_md5_=efd14c47a6874582abd690a84c09410b
+_md5_=c795da23ce5c5a9d37f9d37e7c094a0b
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index db3398b07514..74554ba7e266 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/mrxvt-0.5.4 b/metadata/md5-cache/x11-terms/mrxvt-0.5.4
deleted file mode 100644
index 11f47fde1788..000000000000
--- a/metadata/md5-cache/x11-terms/mrxvt-0.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= ) truetype? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft virtual/libiconv ) utempter? ( sys-libs/libutempter ) xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
-DESCRIPTION=Multi-tabbed rxvt clone with XFT, transparent background and CJK support
-EAPI=7
-HOMEPAGE=http://materm.sourceforge.net/
-INHERIT=autotools
-IUSE=debug png jpeg session truetype menubar utempter xpm l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm64 ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= ) truetype? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft virtual/libiconv ) utempter? ( sys-libs/libutempter ) xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f8ab8942963f9bcf83a910b6e4c6fd51
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1c09450dd503..0d13f8e29e52 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-09-18T15:39:47Z
+TIMESTAMP 2022-09-18T21:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnO8NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnkCNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAN9Q//Wgdj9CiKy/fltgLpXaEfB5EDKVN+NqKgY+ndCHqzWhtDODy95hiBH2TM
-l+u79/U9v1eKndwnZ4jp3m8xznP/hBWR9dzVpgtHc5I4qMbJjxxhxkY5flKnLD1G
-EbV52RIWDPQMYl0u4TU9vy7nQq8bWP2RlY7kNFW+52ehEJvmDeCIbMLF0ZlV6ya+
-+FIffQRGGastFFqVmnXTtmpzQvOECbsGKK6VaKZw9MI2usfsyIjWzGjbi9j80LAm
-kmeWaUMp+qq8/FM2jMvX/FA+57Yv9wDcQZXN0GoQnpK4/jK89lj5qYRlaLq+hktU
-wSNPXoC8ruepqod8EBCfvORGCCpNhLlL2zbUJRgMGRZopwFffXrwzENeWfaUmkjr
-/e5eck7QJA9yO/pMEDQH3PR+NEdK0wNZrDqO2onbZQQ7PmtHLX8symuzyTpIXXR4
-wRX/WgCdnFCU6bWsMfXCRO9xt/v9G0Z9EOILocIcPJFa4XTfags8wze0PMQ1o6Qt
-8Q6/QQpymwo+NX6Vu3UJoyMS6/jCWSdhEg6W0nTovizcOUtYj/6yGPgZHDgH7BJa
-jWJebyWaKGV8DmtdqA/xfuV1XsRee7j0eIhunSMDhbzoov+yuM4wqb01qFa/rj/M
-7JCOKcxQbDt/HArAAaLCPX1E35fFdA2Hstjp4gbgOpaCuwO2JpQ=
-=Z1a/
+klBP/A//ebEY3FN/VQcCBnzTfSKkrnHp8A+mWiDePWpAYm9bP8MQ7Y90FX3XAUod
+5G4HntOZXz23xqYsSX0wxR+2xFZq8BCb8+aZHm/NTlK57EfwG4UeI6NpAKOBZxdQ
+INxFrsCs5/2IYTeUZrvt+Z1X1tYi1E4jTdl0M/zrf6JEqbM97RijgwqZf37PIVff
+5e6gXbP3sbj7HTflgadF+ibyAXk0ANle4UAU3bKcwUarVxafU2g6nxKolMzsuzrc
+Tlsya00Nk3nZutu66I2IlAt0a/1AEIFasFVZ/Lbh+xsh4Sihpzfx2Qr3pWqjxO86
+JzVArtbP4ibDcdRCqUdFJcm2NecQnuyxAt/Tu4UJVBqig9AGnBCamQGnQjUqmEdN
+b4J7sGnFQhwkq0/O8ZXoVXhnN4KyXx6s2sDmkHAKH6T7lRgYPHXHCjkOlJDeNYMF
+k6llsKJMprVKCGsu0pdgWFUOvNqpqEF0Zwas0KgJvQywtR3eR/v82iXPvqurgDRd
+hm2Eu57jOExBy42anCQdJHIxTMq6/pAtzpXULJOVWh0GZ7YaBzWsNFaodQB1Lw4u
+oA8PFSeQ0XZCNEdwOWnHBU/YgBJOLQ5nnMGtkDtZZm3AG+gR/O6aReeTDLN86KnP
+g1GRdYw7f6ZlxSS3k3XtZqYr52xDzI6fEs0nfKoOFRoeKJufc2c=
+=+qTS
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f82496810a03..e5a7ee9c0fd6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 15:39:40 +0000
+Sun, 18 Sep 2022 21:39:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 456baf636528..f3e6680e834c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Sep 18 03:39:40 PM UTC 2022
+Sun Sep 18 09:39:43 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 565d54d03e93..d4f1f3e6be17 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 15:45:01 +0000
+Sun, 18 Sep 2022 21:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1e841f40f1ff..fd8453bc45c1 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3b918754ee7be5ad728e00234b2350e0eeb378c3 1663515273 2022-09-18T15:34:33+00:00
+c1517666b3bb5e08ad6a85aceada2e9ddfc25f10 1663536038 2022-09-18T21:20:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 38c5b4d66558..3b85428d3a1e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1663515601 Sun 18 Sep 2022 03:40:01 PM UTC
+1663537201 Sun 18 Sep 2022 09:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f82496810a03..3f80bfb67520 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 15:39:40 +0000
+Sun, 18 Sep 2022 21:39:43 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e50e9b59a34b..7f9de2c471ef 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
deleted file mode 100644
index ea353e5369bf..000000000000
--- a/net-analyzer/sguil-sensor/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673ef9968e2188ea3f2f0377cdd84db0a1a4a165a428ba9f4270eb28096361291ac2bcddfbf0430916b03 SHA512 a4f9ed9abb050184773c59271d7e13f6bcbf853341dd31c72909ee6d31bb92990d84f31bf3111d8950fb4311747694c714498552eb26ca8a82ed3cb645847e82
-AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
-AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
-DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-sensor-1.0.0-r3.ebuild 2174 BLAKE2B a23c9fc26f29367328f82d3dbefeb8ff66f4858ebb3fbfc220c9579dad462e72f3123b48dad33ddb48fca836baeca95b79cca145c13e9fbebba57deaa269c2ad SHA512 1508bd7e96b5e9b3f839f7567688eb8ff4b7025a3bd56498df97ebb5647a6ad80bd2610c9a4795455cc9cef3ff2ab2268639138576776970e3dd97ce441063b3
-MISC metadata.xml 419 BLAKE2B 76c75b2fa0ab27ba2b14a933a754deeef6d22888b2bc250df8e4af9022db855705824ddd05bc9711db106d7e3b05db5bd4c902d581e095917cc29792759db004 SHA512 72e547ece836ed046185e22a42ca7f807f2affb9d9ddae3633a1c1aec926b0b3c9b37550dda6c057f8c69d51e75ce2ee0bb39f292a172709d1309dc237a18b6f
diff --git a/net-analyzer/sguil-sensor/files/log_packets.confd b/net-analyzer/sguil-sensor/files/log_packets.confd
deleted file mode 100644
index 93bdc772bff7..000000000000
--- a/net-analyzer/sguil-sensor/files/log_packets.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Config file for /etc/init.d/log_packets
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This tell snort which interface to listen on (any for every interface)
-IFACE=eth1
-
-# Make sure this matches your IFACE
-PIDFILE=/run/sguil-log_packets_$IFACE.pid
-
-# You probably don't want to change this, but in case you do
-LOGDIR="/var/lib/sguil"
-
-# Percentage of disk to try and maintain
-MAX_DISK_USE=95
-
-# This pulls in the options above
-OPTIONS="-m 122 -u sguil -g sguil"
diff --git a/net-analyzer/sguil-sensor/files/log_packets.initd b/net-analyzer/sguil-sensor/files/log_packets.initd
deleted file mode 100644
index f372c82c905b..000000000000
--- a/net-analyzer/sguil-sensor/files/log_packets.initd
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="cleandisk"
-
-LOG_DIR="${LOGDIR}/${HOSTNAME}/dailylogs"
-
-start() {
-	ebegin "Starting Log_packest"
-	if [ ! -x /usr/bin/snort ]
-	then
-		eerror "No snort - cannot start"
-		eend 1
-		return 1
-	fi
-
-	if [ ! -d ${LOG_DIR} ]
-	then
-		mkdir -p ${LOG_DIR}
-		chmod 770 ${LOG_DIR}
-	fi
-
-	today=$(date '+%Y-%m-%d')
-
-	if [ ! -d "${LOG_DIR}/${today}" ]
-	then
-		mkdir "${LOG_DIR}/${today}"
-		chmod 770 "${LOG_DIR}/${today}"
-		chown root:sguil "${LOG_DIR}/${today}"
-	fi
-	start-stop-daemon --start --quiet -b -m --pidfile "${PIDFILE}" \
-		--exec /usr/bin/snort \
-		-- ${OPTIONS} -l "${LOG_DIR}/${today}" -b -i "${IFACE}" "${FILTER}"
-	real_cleandisk
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Sensor Agent"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
-}
-
-cleandisk() {
-	ebegin "Cleaning Disk"
-	real_cleandisk
-	eend $?
-}
-
-# This func checks the current space being used by LOG_DIR
-# and rm's data as necessary.
-real_cleandisk() {
-	einfo "Checking disk space (limited to ${MAX_DISK_USE}%)..."
-	# grep, awk, tr...woohoo!
-	CUR_USE=$(df -P ${LOG_DIR} | grep -v -i filesystem | awk '{print $5}' | tr -d %)
-	einfo "  Current Disk Use: ${CUR_USE}%"
-	
-	if [ ${CUR_USE} -gt ${MAX_DISK_USE} ]
-	then
-		# If we are here then we passed our disk limit
-		# First find the oldest DIR
-		cd "${LOG_DIR}"
-		# Can't use -t on the ls since the mod time changes each time we
-		# delete a file. Good thing we use YYYY-MM-DD so we can sort.
-		OLDEST_DIR=$(ls | sort | head -n 1)
-		cd "${OLDEST_DIR}"
-
-		OLDEST_FILE=$(ls -t | tail -n 1)
-
-		if [ -f "${OLDEST_FILE}" ]
-		then
-			einfo "  Removing file: ${OLDEST_DIR}/${OLDEST_FILE}"
-			rm -f "${OLDEST_FILE}"
-		else
-			einfo "  Removing empty dir: ${OLDEST_DIR}"
-			cd ..
-			rm -rf "${OLDEST_DIR}"
-		fi
-		
-		# Run cleandisk again as rm'ing one file might been enough
-		# but we wait 5 secs in hopes any open writes are done.
-		sync
-		einfo "  Waiting 5 secs for disk to sync..."
-		sleep 5
-		real_cleandisk
-	else
-		einfo "Done."
-	fi
-}
-
diff --git a/net-analyzer/sguil-sensor/files/sensor_agent.initd b/net-analyzer/sguil-sensor/files/sensor_agent.initd
deleted file mode 100644
index 08b45e511f8c..000000000000
--- a/net-analyzer/sguil-sensor/files/sensor_agent.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        if [ ! -e /etc/sguil/sensor_agent.conf ] ; then
-                eerror "You need an /etc/snort/sensor_agent.conf to run the Sensor Agent"
-                return 1
-        fi
-}
-
-start() {
-        checkconfig || return 1
-        ebegin "Starting Sensor Agent"
-        start-stop-daemon --start -c sguil --quiet --exec /usr/bin/sensor_agent.tcl \
-		-- -D -c "/etc/sguil/sensor_agent.conf">/dev/null 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Sensor Agent"
-        start-stop-daemon --stop --quiet --pidfile /run/sguil-sensor.pid
-        eend $?
-}
-
diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml
deleted file mode 100644
index e0c75486e6c0..000000000000
--- a/net-analyzer/sguil-sensor/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bammv/sguil</remote-id>
-    <remote-id type="sourceforge">sguil</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r3.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r3.ebuild
deleted file mode 100644
index 0403ede4f1b6..000000000000
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Sensor part of sguil Network Security Monitoring"
-HOMEPAGE="https://github.com/bammv/sguil"
-SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
-S="${WORKDIR}/sguil-${MY_PV}"
-
-LICENSE="GPL-3 GPL-2+ QPL-1.0 GPL-2"    # GPL-2 for init script
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	acct-group/sguil
-	acct-user/sguil
-"
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/tls
-	>=net-analyzer/barnyard-0.2.0-r1
-	>=net-analyzer/snort-2.4.1-r1
-	dev-ml/pcre-ocaml:=
-	net-analyzer/sancp
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:gateway:${HOSTNAME}:" \
-		-e 's:/snort_data:/var/lib/sguil:' \
-		-e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:DEBUG 1:DEBUG 0:g' \
-		sensor/sensor_agent.conf || die
-
-	sed -i \
-		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
-		sensor/sensor_agent.tcl || die
-}
-
-src_install() {
-	dodoc doc/*
-
-	dobin sensor/sensor_agent.tcl
-
-	newinitd "${FILESDIR}/log_packets.initd" log_packets
-	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
-	newconfd "${FILESDIR}/log_packets.confd" log_packets
-	insinto /etc/sguil
-	doins sensor/sensor_agent.conf
-
-	# Create the directory structure
-	diropts -g sguil -o sguil
-	keepdir /var/lib/sguil/archive \
-		"/var/lib/sguil/${HOSTNAME}" \
-		"/var/lib/sguil/${HOSTNAME}/portscans" \
-		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
-		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
-		"/var/lib/sguil/${HOSTNAME}/sancp"
-
-}
-
-pkg_postinst() {
-	elog
-	elog "You should check /etc/sguil/sensor_agent.conf and"
-	elog "/etc/init.d/logpackets and ensure that they are accurate"
-	elog "for your environment. They should work providing that you"
-	elog "are running the sensor on the same machine as the server."
-	elog "This ebuild assumes that you are running a single sensor"
-	elog "environment, if this is not the case then you must make sure"
-	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
-	elog "You should crontab the /etc/init.d/log_packets script to restart"
-	elog "each hour."
-	elog
-}
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
deleted file mode 100644
index 51a9944fabc6..000000000000
--- a/net-analyzer/smokeping/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 79_smokeping.conf 351 BLAKE2B 97e09d4cf9d4b1fe4b334165a0f46bb11dea32cf6a2678a04c48e5290940a197c2efee0fa540726493e623a0f0235fdffde8ee28b2c89af22a804a8dfca29149 SHA512 d53abdf29e8f6bad67a654b17088c3f8dee7908ff82b0b911599e2ac6a11be84b8fa2c30b1f0b6142803ff9a5058f586946eafa112dfd26ca4f8f8664d19cfc6
-AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731d8851cc5f9a81118c9ce9ff76888b0bddcbf6b4341a47a76a74f64aecdc3d1610510714f119ee7 SHA512 75863f16f8b57ca9ae7c7d65076acaf28aac66fa2d52ed78bce2bb3a4938dc75a1e8ed54236c52c3965b170a8348145780dd5c0f3d0fc8c95f4b88085252a4ef
-AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
-AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
-DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
-EBUILD smokeping-2.7.3-r1.ebuild 4069 BLAKE2B e184cf1644685eec1f6dc077304cbe95902b60a35ee47c3542943837f72d24579297986195d8c4a1ff63923970d86c155cdbd24b353a8dd69825d1b6fb6b18fe SHA512 d67b8fe64ba07aeeb047cafdc1a3d54df0e581ad7bbce2ee8b8b31c7e85f7197ec4c872c4ce62a4642e3b0394f720423239cc4af6bbcdda91fd678299de2a8a1
-MISC metadata.xml 469 BLAKE2B 1036c99c507a4962ddb63ea0e55a4937efabcf7f534238c2e83cb63bc967172db6fe48eeda496e41ca532508e2792ea59961a5a17a19fcd47bba54db575f37cd SHA512 452a0d2ff248a80e8fd24f12aa00f517f7625dd37355f265f6c1f1f1632d8397b159ca2d586f3e8d40d42a1857306b92fcbcf3e86d4f981327e1c1af43fa47f2
diff --git a/net-analyzer/smokeping/files/79_smokeping.conf b/net-analyzer/smokeping/files/79_smokeping.conf
deleted file mode 100644
index 1e9361ba501a..000000000000
--- a/net-analyzer/smokeping/files/79_smokeping.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-###
-### Setup the smokeping image cache and perl cgi script
-###
-<IfModule mod_alias.c>
-	Alias "/.simg/" "/var/lib/smokeping/.simg/"
-	<IfModule mod_perl.c>
-		<Directory "/var/lib/smokeping/.simg/">
-			Options -Indexes MultiViews
-			AllowOverride None
-			Order deny,allow
-			Deny from all
-			Allow from 127.0.0.1
-		</Directory>
-	</IfModule>
-</IfModule>
diff --git a/net-analyzer/smokeping/files/smokeping.conf b/net-analyzer/smokeping/files/smokeping.conf
deleted file mode 100644
index 729726316fbd..000000000000
--- a/net-analyzer/smokeping/files/smokeping.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/smokeping	0755	root	root
diff --git a/net-analyzer/smokeping/files/smokeping.init.5 b/net-analyzer/smokeping/files/smokeping.init.5
deleted file mode 100644
index 3c08c3fdc65e..000000000000
--- a/net-analyzer/smokeping/files/smokeping.init.5
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/smokeping"
-command_args="--nodaemon"
-command_background="true"
-command_user="smokeping:smokeping"
-pidfile="/run/${RC_SVCNAME}.pid"
-extra_started_commands="dump reload restore"
-required_files="/etc/smokeping/config"
-
-depend() {
-	need net
-	use dns
-}
-
-start_pre() {
-    export LC_ALL=C
-}
-
-reload() {
-	ebegin "Reloading smokeping"
-	"${command}" --reload 2>&1 >/dev/null
-	eend $?
-}
-
-dump() {
-	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before dumping files!"
-		return 1
-	fi
-	for f in $(find /var/lib/smokeping -name '*.rrd' -print) ; do
-		f_xml=$(dirname $f)/$(basename $f .rrd).xml
-		rrdtool dump "$f" > "${f_xml}"
-		chown root:0 "${f_xml}"
-	done
-	eend $?
-}
-
-restore() {
-	ebegin "Restoring smokeping rrd files from XML dump files"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before restoring files!"
-		return 1
-	fi
-	for f in $(find /var/lib/smokeping -name '*.xml' -print) ; do
-		f_rrd=$(dirname $f)/$(basename $f .xml).rrd
-		mv -f "${f_rrd}" "${f_rrd}.bak"
-		chown root:0 "${f_rrd}.bak"
-		rrdtool restore "$f" "${f_rrd}"
-		chown smokeping:smokeping "${f_rrd}"
-	done
-	eend $?
-}
diff --git a/net-analyzer/smokeping/files/smokeping.service b/net-analyzer/smokeping/files/smokeping.service
deleted file mode 100644
index 2130aca23627..000000000000
--- a/net-analyzer/smokeping/files/smokeping.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Latency Logging and Graphing System
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/smokeping --nodaemon
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
deleted file mode 100644
index 795b447a52c6..000000000000
--- a/net-analyzer/smokeping/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
-<flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
-</use>
-</pkgmetadata>
diff --git a/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
deleted file mode 100644
index 26e3c02ce8a7..000000000000
--- a/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apache2 curl dig echoping ipv6 radius"
-
-DEPEND="
-	acct-group/smokeping
-	acct-user/smokeping
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tty
-	dev-perl/Net-DNS
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SNMP
-	dev-perl/Net-Telnet
-	dev-perl/libwww-perl
-	dev-perl/perl-ldap
-	virtual/perl-libnet
-	dev-perl/CGI-Fast
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/Authen-Radius )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
-	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	# bundled(?) dev-perl/SNMP_Session
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
-	dotmpfiles "${FILESDIR}"/${PN}.conf
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	mv "${ED}/etc/smokeping/basepage.html.dist" "${ED}/etc/smokeping/basepage.html" || die
-	mv "${ED}/etc/smokeping/config.dist" "${ED}/etc/smokeping/config" || die
-	mv "${ED}/etc/smokeping/smokemail.dist" "${ED}/etc/smokeping/smokemail" || die
-	mv "${ED}/etc/smokeping/smokeping_secrets.dist" "${ED}/etc/smokeping/smokeping_secrets" || die
-	mv "${ED}/etc/smokeping/tmail.dist" "${ED}/etc/smokeping/tmail" || die
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${ED}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${ED}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${ED}/usr/bin/smokeping" "${ED}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${ED}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-	mv "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${ED}/var/www/localhost/cgi-bin/smokeping.fcgi" || die
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 0363668a61fb..5b856508df20 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/calico-cni-plugin/Manifest b/net-misc/calico-cni-plugin/Manifest
deleted file mode 100644
index 43b0bdfd99b6..000000000000
--- a/net-misc/calico-cni-plugin/Manifest
+++ /dev/null
@@ -1,71 +0,0 @@
-DIST calico-cni-plugin-3.1.3.tar.gz 64054 BLAKE2B 782847ca79306b27fffd0426b9cd7c5b8e34f39634491beafc1c652d26dd0ebd84b46116b12b3f6e8ebdff4a8aa5db52966ac62e1bba595456f41bbdb3c48fd8 SHA512 d4c064d4f7b5e65c933d6b7866ffc077e20da35ae3af03d8b0175f01f9fb87857a5c891f8e15b877e6a1c238c894a8163458197f7921d866b7a180ed52eed527
-DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
-DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
-DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
-DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz 173167 BLAKE2B 9aad6388fd9c307a31a37a746684ed9fc52ff556ef5209e14c2afebf69af0abc28cb9d825245b87a49fd9947f638344b92143868fea7852db0bd2bc39239a2e1 SHA512 0607a4213f1291cff03d21d6860a8830ad998bcb4c6e3489bf0a8c207137fe9b958c3c453e9cf6fe0911a219d250d89f0e8b3c457900893b9ed8bd31dc696777
-DIST github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz 789110 BLAKE2B b04688b90503cb01aa18d9c1227b7cb510846f8b42678729fb7a80bf914ef4a06c399a8f165b7f01d6a05aaf98d4e97c17675a3774745a7850862bdd609b5168 SHA512 2aa1a665531c2e6b7800d38abdec4f0b68e778ae27c638b4ab097abb720c66a4863fd1f4b59dc818b91bddbc5c7dce4e1fefddfda11881e2334d7b71122bd60e
-DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
-DIST github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz 13564 BLAKE2B 5d0227229ccb548a8978f0ff4f45d55437995ebf09d6af0f71f2fd6fb9ca6ebee58a75c0eb1b8badafd85dc79651672476b8298404dc13aaf8c602bd914a715c SHA512 df1a5c19ac8cd10602886f0adedce07629f56a055bd401caf64e9b330aa7dc40995d203b446bd5486f67c6f932bfcafe4e6af7ff6f9480ec815763bcccc374c8
-DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
-DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
-DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
-DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6
-DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
-DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
-DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
-DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
-DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
-DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
-DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6
-DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
-DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
-DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
-DIST github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz 860438 BLAKE2B a19c673d984177faf078a04b7351258fed56390d09bb74f715409e30a7c99b68ef1861f1890db0683370c290a4fcec8f2a1d82a01e9132160f5a3a2954b9cfe1 SHA512 693f3586a09e2149ceda3b6833154acdd7d924eb6e225697db4d103a9a907147a9b1860efbd0dcecf2db6b39f44b0e6e6414eff318ae4ccaaf36e18f505f438a
-DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
-DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
-DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
-DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
-DIST github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz 596056 BLAKE2B f9b44588375bc50d843fc9e5353744f61e15ea4ca5f62aadedcaabc7f99fdbe6ffbfbcc9a73c8fb1fd60045bcc660e3f282dc0a4f3c5338c680f32ed85c543e9 SHA512 1084079e6d95c9a211282b0a2093719e4ee36e297353f92ab5517cf193e7a083c3ef85df799fdddbe4c9629482424e32045382679b5160a4c074dbb53c242d96
-DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
-DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
-DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
-DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
-DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
-DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
-DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
-DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
-DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
-DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
-DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
-DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
-DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
-DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
-DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
-DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
-DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
-DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
-DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
-DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
-DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
-DIST github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz 400965 BLAKE2B f5516523c7f5e9491c95e3ac4f399e1aeccc13d856c565f0f6756265f30c2654df95bf78220b4f0c68dfde9e9183f39d8609b64379e2268dc2fb31530140c575 SHA512 c89799c49cba672f223900cd83994a6667ccaafa2798a3cc320761b1f28367b2e07903c6d19c901af19e7859179089510b1dfcfc068075fb7e03724e9341215a
-DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
-DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
-DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
-DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
-DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b
-DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
-DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
-DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
-DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
-DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
-DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
-EBUILD calico-cni-plugin-3.1.3.ebuild 6368 BLAKE2B 5681bf38f660ec0d91cfd50da55072081756e9f9cbcdb7843c49384a09821e1d0ae31c26d378ed34e2bb0bc5be49d722cf2544316af6f62174973d49c4b57d85 SHA512 32bb4bc54951e746c3e4955c37529aea883e62de41a7495abf2958cd641c4e78b70c97b9df6158fe00c1e9b56a7ba1501f932914cf4cb257d6055a808baf2235
-MISC metadata.xml 263 BLAKE2B 38613428e9586c6f2481bbac59501f9895cd07a6b76532aefdec35bd09170de4207421937a5eb77530f58075c9d924d6170c40103973b7474065468dcac8c7dd SHA512 ccf407a3bffcc66b1ce0a92017ec86bdf88e51ff1ede9d219fdb0d5cc4b1a5ea207a4c42a76a3c8fea195cf94a6246ed551054677cf40e7c6dea537d68d91390
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild
deleted file mode 100644
index d7fd91558458..000000000000
--- a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/containernetworking/cni a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
-"github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/coreos/go-iptables b5b1876b170881a8259f036445ee89c8669db386"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf"
-"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common 7600349dcfe1abd18d72d3a1770870d9800a7801"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
-"golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api"
-"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico Networking for CNI"
-EGO_PN="github.com/projectcalico/cni-plugin"
-HOMEPAGE="https://github.com/projectcalico/cni-plugin"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-containers/cni-plugins"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	sed -i -e "/calico-ipam:/ s/vendor//" -e "/calico:/ s/vendor//"\
-		-e "s/git describe.*/echo ${PV})/" -e "s/CGO_ENABLED=0//" Makefile || die
-	rm -rf vendor/github.com/containernetworking/plugins/vendor/github.com/vishvananda/netlink\
-		vendor/github.com/containernetworking/plugins/vendor/github.com/containernetworking/cni || die
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}:$(get_golibdir_gopath)" emake binary
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	exeinto /opt/cni/bin
-	doexe dist/${ARCH}/*
-	dodoc README.md
-	popd || die
-}
diff --git a/net-misc/calico-cni-plugin/metadata.xml b/net-misc/calico-cni-plugin/metadata.xml
deleted file mode 100644
index da3c5167aa48..000000000000
--- a/net-misc/calico-cni-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-   <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">projectcalico/cni-plugin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
deleted file mode 100644
index c2e81c7acbe1..000000000000
--- a/net-misc/calicoctl/Manifest
+++ /dev/null
@@ -1,87 +0,0 @@
-DIST calicoctl-3.1.3.tar.gz 87574 BLAKE2B bd1c00f5ba084bb7bb49af64fed0dfd3cac8da921f8e33ecafea1329d7d09de3d2051680f8f0a3638d1cb98b90a9cddf0a88438844f365ffcc1fc6a9d50d656c SHA512 7369ecbdb4c7afb383e0e47ab088022b020665854a66400ee415dbc64a9ce7fba32ace67e202d13e8feaf2bde7c7e3544ea46e98ea0e2f9fc59c7def4a851479
-DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
-DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
-DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
-DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
-DIST github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz 5943 BLAKE2B 35f99d69b58cbdf7b49d9aba5b8456c2702dd2fecec3da6e522e5d97e13b697037afe81c115a0a8980b25d99ad3216d3e07027c912a644a4efcb27c6c1404022 SHA512 431e41870728d86accd7ed78d1e16c92adebfe79cef59b7f656a395e4bf7727ae9521f7e9d291931590680fd32eaef26622d888f30a4a4511dbddcae8dda1c08
-DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
-DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
-DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
-DIST github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz 33471 BLAKE2B bd97ffc4bdef9c3c7007d9af34c2e330d3068379f0718b3f0831379d1ff7fdc2ca63e5579542152d68d546a23e82baeb601cc796cc76a82154b2f488f789721f SHA512 12a26fd70674394fe5dc64695314d85c08370d134c8af0d8047363938c90c23f40e0f8f8b25e9288c40bdb28513cfe64fac738a6e557f5425531d7dac01586e8
-DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391
-DIST github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz 11711 BLAKE2B d024ead4af79692729ebf790a26e53ceefd005efc97017a9ebedfa345640c1f86cbaf1c61267abc478619b41c371887dcc363672a7d4a7cc61476997ca81864e SHA512 378d5ae07b41275c6a1633e26470255210ba62d6fdd6b926ae3f48e37160f659fc050e9866267cbfd86fe07a8c0ef3cd00eeda8cd9deb0ef66af697773d71601
-DIST github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz 3503 BLAKE2B 95a0030b182097aa1fb640f34b60fa094073f57ed576da5180b49e254e20f88a5b3980742b43d55e02c715a8dec9f0a58a5410ab91c88a19ebcf1584ab0f7216 SHA512 7aff388e6908911bee51e0c22be9252981c22980d78f911b96235e2ea0f8ddb38b80bc3c513dbd30f8514ab3012f83e688b0beb959c917b5b45d6db57c15a162
-DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
-DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6
-DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
-DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
-DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
-DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
-DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
-DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
-DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
-DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6
-DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 BLAKE2B 9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1 SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
-DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
-DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
-DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
-DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e
-DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
-DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
-DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
-DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
-DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0
-DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
-DIST github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz 12725 BLAKE2B d9db98b01c8b4b3e62fcd8f94e890c58ab80dce88f8a8b811eff9fcd9e35a76a53dabbe591f66b10e281c268806d69b29f558091d0e091612443197dd9ba5ca8 SHA512 16b23b56b7e99ef19b1e8251b646f13be1bac0f41df8077d80235434c1c3f187fec3782667eb7ff022442915ffeca1b28ff18b410bd7c6cb9db29a72beb168c9
-DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
-DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
-DIST github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz 290203 BLAKE2B 597bc6f65176cb615107b06317ac30ba94b5465d79147ed92e5d41973d714ae091dec237094c7c53e1dcbb192d3f5856daa7eef156339e5081d7c58b1ce4b3bf SHA512 95b65bde3921e31bfefa11a9631d7d6b7908f457695ef4544d7039395c270cd4a2b0bd9ff0a62be4f6bd0e35853823687e5fc6100993384573a309318b6a2e21
-DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
-DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
-DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
-DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
-DIST github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz 70427 BLAKE2B 3b699fd5923ce6c823bed429fdbaecd0ea3f1a7518e37d7b4698b2b112e24c049a90994c1651fc66f0def3958865b88374ebb39e03618c09a49a5795661d3498 SHA512 d56f15b28e89c638d2d5c4f7859d3612ae7c7f981a6950ea59bb87987ac4db6a3582b00680ccd4f9e579b3d2c5e53958d89941270366e159772959a4c5b1e96f
-DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
-DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
-DIST github.com-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz 1290543 BLAKE2B 6517450c7d4cdac1908ed0a498c4cf6c66ec5f64631edabd5293c3eacae02a4650affc4af80beecc024d34aaa629827b9d116974f2b2bbb978fa57c119b143f7 SHA512 ca66e7fb49c3525222a3dd90bc62cf835218d95018ce093a2464b42b70293c3a7203c9a930e92d788be6f67a90558def5d6c62802280fdf382874acf372ee8ac
-DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
-DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
-DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
-DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
-DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz 29495 BLAKE2B f394e50ce58dfb59db8e8ef6364cdf494604cec2e042009a8a72250908102ce31bac173291f9c75ad585cc570fb7635b7146b1ec85daf01899945b5bbe1be621 SHA512 fe3e521365758b42df60acd8d582a080eb4828ef56cd20da57b6041074bc4b7673f01a6ee83d8271abf60609efd0c200149ccd7564da1b3a40bbf3e2c9967e66
-DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
-DIST github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz 22988 BLAKE2B 3fb35426ba8d909d20a1fd939998685efc4b8ae684defe13b27d344350b7de366b05953eecf93ed192263e8d72380c7f4c644334f1192f1482393d8c7390b511 SHA512 1379124ce0f1c83d6677b110ff43ee6b8b003d125b311666de2fc029d25b59ea895dac1bfd812ceb360457379276650f62b8747d9fba15de78f3b57cf7d72af9
-DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
-DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
-DIST github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz 7591 BLAKE2B a5f8b5f65740ea93f2dcd753567885530c4ec9cde743780e74fe0fe08056f87464f398ee6fba37b26a2d74342d839df45c7fe649f3857018649c86d96c87ec67 SHA512 143b517ef8b5a8bda86dee77b573b12e051816bb6cd0ba962befa3fde4d849a4b95c02c76d36a08209fa29681bbb39fe28a69ba9fb326f218bb4f3ca70350496
-DIST github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz 18671 BLAKE2B a06836438c27cd4386fe3d2fb234a4ecccbc011fefffb52f9cb71f55443360c186c48e603ae745a6266b7356fbfddd92465f246b73b2bd5b9fe233af979bb552 SHA512 b5740447fa3b81ff8b713f328dbbf866f01527ee71f23141595d0c0f39d865f9ea95a04bac118dc223a3ebfc3ebeb5b8f857fec66f4232ef7da8f292ac8cab59
-DIST github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz 17378 BLAKE2B 23cf5e288d72278f082e1b533ef8324abc268a317b7c11772af89f964e646b22fa246833eff4d0307a89dc89c0c304e3dcb3e37ac1f3252f7213655acdf887b6 SHA512 9418d06e67a72089f0b35f9f7eb1d0da68ee8c433e4577b798a6ba428233b2f9c3bec5723ed6620c5ed257ccb1a1f32262394f21d4d781c3d56e8b2034ac7111
-DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
-DIST github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz 669740 BLAKE2B afecd69c02b30555625e96ae9fde583336620e2ba8129817bf4af60a1db4ce33c630e0d7de47d42996970ec94a781a895ba8a938a3132dca560e8d2c1a0529bd SHA512 5d9da0f1ccb9443e834d32662906c8cda0c4b0a780d61283a433e0a86af97579938ab5814e5c337c3febe57963256db0107564e73884eaf78edb2357fc4eb7b1
-DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
-DIST github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz 56998 BLAKE2B 3971cf040257c6daf6175f25ea01b8026a04b74d5a56dfa0a562fbd6e64ae7111aaf94080c141f2c595ebd38cc3f0611f7f05e419254fc40c63c4493f2a468c7 SHA512 3aa9af45b36d280637231fbab39584542ba0892cc0bab177add01254caf90a49d14c4131249e5615b8035cc61dbaff8b65da27148a1026fb36d32d4ac48dc13f
-DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
-DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
-DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
-DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
-DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
-DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
-DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
-DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
-DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
-DIST github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz 45193 BLAKE2B 78dd065841571fee60c41a83af08a97478f8a47599eb4e451717a8460856fd20be7732761b8321514993b65477c92492e81eb69d2548bf2468b5e072b2d2d25d SHA512 c1e1e2af81d6474a0404c3d3152b1ba8b89e6f3f90234e2fe869ffad6003f44773ca9411d96e70c959ea8a5ac9d8ff8fb11360edda71eea2e4de96b815e06d51
-DIST github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz 9864 BLAKE2B e2bca43b06e8cedc63504b716f052ae5d6da90d2336372bdcf1c7bd456e8e60c9f830fa1da6cc6602b4355196c8c0e74e480f55020ead5706f3e0bead1cba08d SHA512 96ed2d94c7e970c9894751245fe4a0b17b6fa2f0fc524d3c8a05463dc5bf81d48bba4d01c0c742ca492f756fd6f21034c2cd1be44047d79f7ab87d2e4c76f1d7
-DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
-DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
-DIST github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz 32109 BLAKE2B 3d1f8c8d943766a7b7402f30ce80fe78a96b8455f901b6c3dab786682c84ba3a7515e62b1f62f5124564f6ea664abea1e2f77685e259f5e31db3241aeb89c826 SHA512 18fd5063350bec742ec85d7299c678d825be9f6745990264fe98c6b874ab3abe9bc478fb97059b2e675b78dc5bc3f12fc9ae65ce9e7c170f8abf9498b6e78071
-DIST github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz 3684 BLAKE2B 92a9f37acc2c3f497c432be4519edc02db7d5bb371309183a3a52034cf12e4626b8b018f7b17e3128a406edbce24db1d2c5a0176f8221907c27f198696a2d737 SHA512 b007be79389160c27a602f4ec35a969a408abb340ab9b3bd8f44578a6dd9ac95fcede4edc56b1c1c7a2a9f258c5cb448cda54bc91d6dd17f0464cb050b946769
-DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
-DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
-EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
-MISC metadata.xml 256 BLAKE2B 995a229f338183a61b6007d8b9cf46ba1092f669df278c9a83a162e6924988a78e87c74f2d84efc31d264895aad0c5008679efb67358c43383bf702a763820dc SHA512 1ffbf45adf66e18087bcb009d6d1ec3ed2735267e6304c4f74c010652991f89d5106799e5291d75b6b9bcfed57284e0d3d56a8bf48bffbf5179e99ab07057b7a
diff --git a/net-misc/calicoctl/calicoctl-3.1.3.ebuild b/net-misc/calicoctl/calicoctl-3.1.3.ebuild
deleted file mode 100644
index 8c4041dc0315..000000000000
--- a/net-misc/calicoctl/calicoctl-3.1.3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go d2709f9f1f31ebcda9651b03077758c1f3a0018c"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
-"github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/influxdata/influxdb 0253f6fe05e8aa5d5382ef7a05d5c956a11fac94"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/magiconair/properties c2353362d570a7bfa228149c62842019201cfb71"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/mattn/go-runewidth ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
-"github.com/mitchellh/mapstructure bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
-"github.com/olekukonko/tablewriter d4647c9c7a84d847478d890b816b7d8b62b0b279"
-"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf"
-"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240"
-"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/pelletier/go-toml 66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/afero 63644898a8da0bc22138abf860edaf5277b6102e"
-"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
-"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/spf13/viper 15738813a09db5c8e5b60a19d67d3f9bd38da3a4"
-"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api"
-"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot
-
-CALICOCTL_COMMIT="231083c2ce934b7946ebed3ed96f4fc1a3ba4f69"
-
-KEYWORDS="~amd64"
-DESCRIPTION="CLI to manage Calico network and security policy"
-EGO_PN="github.com/projectcalico/calicoctl"
-HOMEPAGE="https://github.com/projectcalico/calicoctl"
-MY_PV=${PV/_/-}
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
-		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "dist/${PN}"
-	dodoc README.md
-}
diff --git a/net-misc/calicoctl/metadata.xml b/net-misc/calicoctl/metadata.xml
deleted file mode 100644
index c56a56f4f13d..000000000000
--- a/net-misc/calicoctl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">projectcalico/calicoctl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 5db937058b52..dae59db2dc16 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,4 +1,3 @@
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.5-r1.ebuild 619 BLAKE2B 887865a51c09dbe1a9d2dd36333628f850544b97bb8f5da6649f5b75896479882b7948b98aec22c14aa9e1bad045f40a32eadd9f8189172fce36495d1664ddde SHA512 b82a81ebae3366e0b2f4e6f8688bc6e0a55f40ad860c8eeefcea538b9e3a5a9c897134c1929e2d6cc260869f0213a1013a615e91c30e2efbea73bdfef442841e
-EBUILD keychain-2.8.5.ebuild 637 BLAKE2B 8a6dec9e1536bf5df5cd6ac2e07c816862a9ce5cd85ac40e725b3a8f7b6827a6f31eaa70981fde85d697a29e06a8e08b83bc1d9099d444a293aa63bbec52bc63 SHA512 f6f714cd2f9f55cced05171c046ad88166ee79edfd1b7cf793a6cc02687f91a54f5aa434e0b99450dab94aa2b233cfb8936e4ddd5e2c3b62498bb0d765d3bb4d
 MISC metadata.xml 527 BLAKE2B 244df1b2a5ab0820d287c8cd2b56829cab27026eca673cffc5191f945bdc9cea69fe65d5de87ef147d9060a01a044110176d8377835775cbe5425796b671f836 SHA512 90e1a381903b19a64317859afcc629a22ac9c414bb61ce333966c8d2f39fc728e98d21e2695df130da645802daafa146649fa2a5a03720b53e8e3d110f589d6b
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
deleted file mode 100644
index 46c5f47290f6..000000000000
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
-HOMEPAGE="https://www.funtoo.org/Keychain"
-SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.md
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8f387987f7b5..adb4bf4061e5 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 6f46776db0a7..9e34df407953 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -57,6 +57,7 @@ dev-util/cargo-c
 dev-util/cbindgen
 dev-util/git-delta
 dev-util/maturin
+dev-util/tree-sitter-cli
 gnome-base/gdm
 >=gnome-base/gnome-core-apps-3.36.5
 >=gnome-base/gnome-core-libs-3.36.5
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index ef16c980ebba..192c51f6b83d 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -32,12 +32,6 @@ dev-python/tox
 # ping me.
 dev-python/versioneer
 
-# Michał Górny <mgorny@gentoo.org> (2022-05-18)
-# pp2sp is no longer maintained.  Its build system support is limited
-# and buggy.  Packages need to migrate to using DISTUTILS_USE_PEP517
-# instead.
-dev-python/pyproject2setuppy
-
 # Sam James <sam@gentoo.org> (2022-04-22)
 # Obsolete virtual.
 # Only one provider is left (media-libs/libjpeg-turbo), please change
diff --git a/profiles/package.mask b/profiles/package.mask
index 8dffe429cb8d..dad4e8283d6c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,16 @@
 
 #--- END OF EXAMPLES ---
 
+# John Helmert III <ajak@gentoo.org> (2022-09-18)
+# Unfixed root privilege escalation, bug #631552
+sys-cluster/slurm
+
+# Michał Górny <mgorny@gentoo.org> (2022-09-18)
+# Obsolete in favor of building via PEP517 mode.  Buggy.  No revdeps
+# left in ::gentoo.
+# Removal on 2022-10-18.  Bug #871522.
+dev-python/pyproject2setuppy
+
 # Pacho Ramos <pacho@gentoo.org> (2022-09-18)
 # ABRT environment keeps breaking more and more on non-Fedora systems.
 # Removal: 2022-10-18.  Bugs #849305, #849092, #849095, #713858.
@@ -135,11 +145,11 @@ mail-filter/sigh
 # Flask-Security-Too is a package with high maintenance cost
 # and no revdeps in ::gentoo.  The next version bump (once more)
 # introduces more dependencies.
-# 
+#
 # The remaining listed packages are used exclusively by this package
 # (or its tests).  If you find one of them useful, please let us know
 # and we'll keep it.
-# 
+#
 # Removal on 2022-09-29.  Bug #867415.
 dev-python/flask-security
 dev-python/flask-babelex
@@ -310,42 +320,11 @@ dev-util/bnfc
 # See: <https://github.com/martijnbastiaan/doctest-parallel/issues/45>
 dev-haskell/doctest-parallel
 
-# John Helmert III <ajak@gentoo.org> (2022-08-16)
-# Multiple vulnerabilities, unmaintained upstream, EAPI 6. Removal in 30
-# days, bug #830138
-media-gfx/gif2apng
-
-# John Helmert III <ajak@gentoo.org> (2022-08-16)
-# Vulnerable, unmaintained upstream, maintainer says it's time for it to
-# go. Removal in 30 days, bug #769758
-www-servers/thttpd
-
 # John Helmert III <ajak@gentoo.org> (2022-08-14)
 # Vulnerable, unmaintained in Gentoo, EAPI6. Removal in 30 days,
 # bug #772209
 app-crypt/keybase
 
-# John Helmert III <ajak@gentoo.org> (2022-08-14)
-# Remote code execution vulnerability, dead upstream. Removal in 30
-# days, bug #791004.
-x11-terms/mrxvt
-
-# John Helmert III <ajak@gentoo.org> (2022-08-14)
-# Dead upstream, vulnerable, no revdeps except a usedep. Removal in 30
-# days, bug #618000
-media-libs/libaacplus
-
-# John Helmert III <ajak@gentoo.org> (2022-08-14)
-# Vulnerable and unmaintained for years, many open bugs, no revdeps,
-# EAPI 6. Removal in 30 days, bug 733354
-net-misc/calico-cni-plugin
-net-misc/calicoctl
-
-# John Helmert III <ajak@gentoo.org> (2022-08-14)
-# Vulnerable and unmaintained for years, many open bugs, no revdeps
-# Removal in 30 days, bug #631140
-net-analyzer/smokeping
-
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-12)
 # Masked for testing, depends on dev-qt/qt*:6
 # Pyside6 is stuck on python3_10 for the moment being
@@ -358,16 +337,6 @@ dev-python/pyside6-tools
 # Removal on 2022-09-10.  Bug #864889.
 dev-libs/libdivsufsort
 
-# John Helmert III <ajak@gentoo.org> (2022-08-10)
-# Root privilege escalation vulnerability, many open bugs. Removal in 30
-# days, bug 630752
-net-analyzer/sguil-sensor
-
-# John Helmert III <ajak@gentoo.org> (2022-08-10)
-# Root privilege escalation vulnerability, unmaintained since the git
-# transition, multiple open bugs. Removal in 30 days, bug 630752
-app-admin/logcheck
-
 # Jimi Huotari <chiitoo@gentoo.org> (2022-08-02)
 # Masked for testing. The split of some packages may still
 # change. bug #838970.
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 87339087d27c..5b6de63728a9 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -15,3 +15,4 @@ move net-p2p/go-ipfs net-p2p/kubo
 move app-admin/ansible-base app-admin/ansible-core
 slotmove =dev-ruby/rack-test-2.0.2 1.0 2
 move app-office/gnome-todo app-office/endeavour
+move dev-python/python-levenshtein dev-python/Levenshtein
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1baf084f7fa5..1a6b7fbf3d53 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5396,8 +5396,6 @@ net-analyzer/sarg:glob - Disable to ignore wildcards in file names
 net-analyzer/sarg:pcre - Enable support for regular expressions in the hostalias file through dev-libs/libpcre
 net-analyzer/scanlogd:nids - Use net-libs/libnids for packet capturing
 net-analyzer/scanlogd:pcap - Use net-libs/libpcap for packet capturing
-net-analyzer/smokeping:dig - Install net-dns/bind-tools for dig functionality
-net-analyzer/smokeping:echoping - Install net-analyzer/echoping for echoping functionality
 net-analyzer/sngrep:eep - Enable EEP packet send/receive support
 net-analyzer/sngrep:gnutls - Use net-libs/gnutls to parse captured TLS packets
 net-analyzer/sngrep:openssl - Use dev-libs/openssl to parse captured TLS packets
@@ -8982,8 +8980,6 @@ x11-terms/mlterm:skk - Enable support for SKK (virtual/skkserv or app-i18n/skk-j
 x11-terms/mlterm:uim - Enable support for app-i18n/uim
 x11-terms/mlterm:utempter - Enable support for sys-libs/libutempter
 x11-terms/mlterm:wayland - Enable support for Wayland
-x11-terms/mrxvt:menubar - Enable mrxvt menubar
-x11-terms/mrxvt:utempter - REcords user logins. Useful on multi-user systems
 x11-terms/rxvt-unicode:24-bit-color - Enable 24-bit color support. Note that this feature is unofficial, may cause visual glitches due to the fact there is no termcap/terminfo definition for rxvt-unicode-24bit yet so it is necessary to use the one for 256 colours, visibly increases memory usage, and might slow urxvt down dramatically when more than six fonts are in use in a terminal instance.
 x11-terms/rxvt-unicode:256-color - Enable 256 color support
 x11-terms/rxvt-unicode:blink - Enable blinking text
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 78cf80947e44..6d60cc08f890 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index 52feea420b28..c91f573daf39 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,5 +1,3 @@
-DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981a3b9823a905ce3c178109b230e6536edd4f38ed0762872b38186774127a164feb7363bb45cbd80e9c0b34398c1a06092 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456
 DIST gsmartcontrol-1.1.4.tar.bz2 691155 BLAKE2B 484452b85e848ca9d0539f9fb9e63fc60f837d5e5de1d85d6ef6340fba194ea52cb2026682b263b1391a59eee4ee846dad3863dc1f0bd00296015ddcf86dda9a SHA512 a59147f7adb76fa1cfc55198d175b38f7840c0ec07563bc020757d7609891c8f67953b87a867235821f90c52bc3c8e40a8d8a57a1429e4b75a3afb3a2ada42f1
-EBUILD gsmartcontrol-1.1.3.ebuild 1009 BLAKE2B 68fbd4e99795031f6d1124cd756f30f271746a7546ffdafb0d9c0d765292e3415e163edec83d6d692fd21ce29aab2d3fcc2db0e38817939d561458a28e21037b SHA512 a05864d911a09af9a435d3c132e5aae57eb8a458fcb818a18d4d4040af55467b620aa35a8b8a202acc3dd32fe9722a0c1afc474b223dae5a8f934a9daa83f97c
 EBUILD gsmartcontrol-1.1.4.ebuild 809 BLAKE2B 3f6d9c6f809e8a0d4664267889d7e30b18a7aed974175a54d102c78a1f19203d0529996a6735dcaddc9c0be880c7fc1793a1a9bde807fe976675b6bbee6a5ecb SHA512 71451c1737e4025a70cc9cac4cde42ddbec851fd60492e194a61bb816a260a6f98220415a16214c3c322e72790967cfa8bc9a907875834504f37583bc4bff025
 MISC metadata.xml 403 BLAKE2B d956dd9002a8aff344b2f3ef3828ce9d9d7f765a94c3c53155fb0a71d4c1b8e65a1139e00d4865b06baad3bdd87995af9d242fe8e9ad0a6cb3d172ae68b3cb55 SHA512 785a051ea2334eb59b738ff41a104b40bbc8cf3aa2922bc4697abe74138df34dd6a8bd5c8fa905c4f560685126e8c072f4348604e38a70f9b7c41e2e7885fb37
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
deleted file mode 100644
index 66da4d4c59b9..000000000000
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hard disk drive health inspection tool"
-HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/libpcre:3
-	sys-apps/smartmontools
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmessage
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/gtk-builder-convert )
-"
-
-DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	econf $(use test tests)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/sys-apps/minised/Manifest b/sys-apps/minised/Manifest
index 2d13fdd27b11..974c558244ca 100644
--- a/sys-apps/minised/Manifest
+++ b/sys-apps/minised/Manifest
@@ -1,5 +1,3 @@
-DIST minised-1.15.tar.gz 32224 BLAKE2B 9dac7557fc697aac8f42daf09bf68ac87a79cb7cbcbe6c3372d9d229a3010b86399658df00c04f039c64f75749d7e905a196e1e7532c3f0e3ae42edce385fb08 SHA512 82ebe5c70f24adebd5f1c37422bac543c06684bff40d1d1fab473abc248d4c5f93e7a4969204877170fed1f2616f6fb666bd485183115cc996ba691c7bb88a71
 DIST minised-1.16.tar.gz 31067 BLAKE2B eb37d147434fe06b3c1741d544a6e3088f265e17779e156317a9eaaac99d77276c93e2c60b49a92423378509f7588c50a1421d3d74e0086fb1fbc3bf5079da09 SHA512 9d81ba58f5460e341d9de7c4b2af38c7bf39ae40fdcfac1652e7ad64bd903d58222128880daeb30ef5c1726a244d815ab9c7b22b9cb92c7aeaaa7728f29c4116
-EBUILD minised-1.15.ebuild 405 BLAKE2B 679782eb53de550e7b54b78c098e97d897e37631682c6baeb80f561303d7442730b9caf8aae66cdeb7e31aae759a9c981e30fee070e0397c30b34d4994a22c00 SHA512 a237dfcbe39ff7f7ad5690fb92e2daf200adbff29379f30069750749e31762845e11f76caae2a883b93208296bf5751585f9c7aebbc90f01790f5c58da84ba99
 EBUILD minised-1.16.ebuild 402 BLAKE2B 31bda144a6c4d808271cd626a532818434178847f9a4610f819659e281335a3e899e225c8fc14cac1a47fc81d9b06c48a57dde4f50f4aa871a9347b1c9891d90 SHA512 f5b5f295967e31b894f7408cc4ab3483e38bd248403a874360d2da78019c2c1360178d8a273050c78f77a71aa8bc469f69be26a81b56652a1a97b9cca20d5c04
 MISC metadata.xml 362 BLAKE2B c4ebe1d9e4f16ca0e52a21fcf18d74d64320fbb05df6274d922da1be585600d805c774a546dbd40fcbb7f3090573dd9661e9cfefe61a455ade10697e2f1377c8 SHA512 a4e14a9d55025f9d23796fece229cf4e33bc8c7469ae55438a23a1ce3901612ed4be33673587e65bc39c2e5995a6f773fb4a461c0b2e8d87e45b23bb733c782f
diff --git a/sys-apps/minised/minised-1.15.ebuild b/sys-apps/minised/minised-1.15.ebuild
deleted file mode 100644
index a487b04f1d13..000000000000
--- a/sys-apps/minised/minised-1.15.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="a smaller, cheaper and faster sed implementation"
-HOMEPAGE="http://www.exactcode.de/oss/minised/"
-SRC_URI="http://dl.exactcode.de/oss/minised/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-src_prepare() {
-	default
-	tc-export CC
-}
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index faf0821b0261..667614b003a9 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,19 +1,8 @@
-AUX 250.4-test-systemd-tmpfiles.standalone.patch 1369 BLAKE2B c0f2f51d0b7127a5a0161f9a56f4e94d9b4e983f9f496601ba4ce9197076556df4f699871480ce0cc0a4002b0c8a6fec6706a358b1b28ab75dcf216f2e408821 SHA512 18b9852cf9fe53e45ca0d3f051580e726aa39462c5477c7143523903c3836f131df44837ec19acfff10281bfe0e0b4c53ea4cb2ebed9e342f1289db07fc752ed
-AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
+AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
-DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
 DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
-DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
-DIST systemd-stable-250.8.tar.gz 11215608 BLAKE2B 2a66a2d8cb70f265b59640ace907b8d927018fe11c8977e134a33d67683f06b26c1eb3fd5afe40431bc2c15827ba60c46a37ff1a0a4c716dd24b73aca1583d00 SHA512 653f527f10779a31213da06f7587a3617bd4b823bd3e5a43d626c5a4a7301e4a0fb42cf1fd056d28af6d87e52f258da59d5f0d4a2d98076905f9d3fcda6d18fd
-DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
-DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
-EBUILD systemd-utils-250.7.ebuild 11342 BLAKE2B 67a094e130be3b21a647a3db3a66ea0b35b6f4292fa98c3e81d6a2ecd09b291ef08efdbb048e73c5b141b1cf815a4d7a340c6b43c65aa6a3f5b31fa962b60f89 SHA512 2d88c146cebdc0ae5344c80cf807507e343e77ca37af9b0c28cd131ce2f532418e13773ae00a712d54302b8196e4b5696c1a213dbb2472931d79e1f8485b4537
-EBUILD systemd-utils-250.8.ebuild 11350 BLAKE2B faf9c2a6685159fe9352e88ecc5855f38c7806f4a2da41e2e5ad1ce6124a4fbb9b42a71c351070297a821b093856a4b75263865b1ffe0d7fe16ebdced0dfdc64 SHA512 6ebec4e3a65f50467bc3b5995acb0ab483723e87dcfef8d4c5a7b4f26d8116049ed2c4c78f3f03f9216af5dc87767e69195f0bbff909644bfa91e688bf602058
-EBUILD systemd-utils-251.2-r1.ebuild 11492 BLAKE2B d32e0222842f5981ee2aab1a3a67b1679e409b195503ad9f7ef185150e5fa2b98504c774f4bbcf5260523309d431582dc75fcf3d67818a981dbaffe40add999a SHA512 b2c1c51130c7ac90a98ae8af25167d2dc47dee6ec92342bd83159898f1a2170b4599c984d00430294cd4ac7895996e7b8682d111ff82148d574e613719b00588
-EBUILD systemd-utils-251.3.ebuild 11646 BLAKE2B 37fe82a6f8666983d40181ad06ba5112f5c1a46e80502997091d9a4447fd96314fb34d8144e436a130736241e4ae53910fc4f3e899eb65347f3515ba758e08b0 SHA512 a1aeb1538d383907b39bf438ec646a809b0ce427846bbc37f1b141badbb711f85c056b36b25aa271db4639e8b1118b463ea04a92911a20b7fa4dc113d77ac188
-EBUILD systemd-utils-251.4-r1.ebuild 11923 BLAKE2B e7afaabb0fc8abf513af5ea822dfef5ccfcd0956a5867fbcacb662c171389d85d8a8d77ae00d6b96414ddad7dc2d4d2ddd2d28e2de811ae04bfb9717c2135123 SHA512 87470a9e664a4cabf1a432cc52fa711fad1169974db75b59d1265c700f1267defca1cf43c1ad37cd34f799f3676f52bb0c431e49ea6bae51abe31ae030082738
-EBUILD systemd-utils-251.4.ebuild 11605 BLAKE2B 05df0fe17d81668674ce544c647a06ad269627d33fd3910e59f57bc96c52aa2aa6228bda07adfc87a6e9bae4086608179af2f4d57920ed79fa9c89cef948cd73 SHA512 a2a7914cac1d8e19b227716d82b09d7de1fc66a4694bdecde85ce977ee7b7038f567f685da6e9343895c6accd97e5640dea9c6595d1120f2635322162b9e1687
+EBUILD systemd-utils-251.4-r2.ebuild 12095 BLAKE2B 21014fadfa7a5ea04e2cabde58ff7a5c404c28feb224680309c49f3f056b2b0af92688d245f17f42896e71bd1e59879ed070c691dfadaaa29e90580a3a216038 SHA512 f3bb8010c6162fc601b95eebc297ae8f3f5256bd6a20c70423aec1c90854744c773f63affe3f610c3b28ab795f5579cfb45ec57f70cb5eb6121c4347a7f45e95
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch b/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch
deleted file mode 100644
index a915cbb43115..000000000000
--- a/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 55bf689308ed00692494d3623bd2064f33c9bbbe Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 17 Apr 2022 09:48:28 -0400
-Subject: [PATCH] Add test support for  systemd-tmpfiles.standalone
-
----
- meson.build | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 458370e83d..d60be1b050 100644
---- a/meson.build
-+++ b/meson.build
-@@ -3451,7 +3451,7 @@ if conf.get('ENABLE_TMPFILES') == 1
-         endif
- 
-         if have_standalone_binaries
--                public_programs += executable(
-+                exe = executable(
-                         'systemd-tmpfiles.standalone',
-                         systemd_tmpfiles_sources,
-                         include_directories : includes,
-@@ -3463,6 +3463,14 @@ if conf.get('ENABLE_TMPFILES') == 1
-                         dependencies : [libacl],
-                         install : true,
-                         install_dir : rootbindir)
-+                public_programs += exe
-+
-+                if want_tests != 'false'
-+                        test('test-systemd-tmpfiles.standalone',
-+                             test_systemd_tmpfiles_py,
-+                             # https://github.com/mesonbuild/meson/issues/2681
-+                             args : exe.full_path())
-+                endif
-         endif
- endif
- 
--- 
-2.35.1
-
diff --git a/sys-apps/systemd-utils/files/251-glibc-2.36.patch b/sys-apps/systemd-utils/files/251-glibc-2.36.patch
deleted file mode 100644
index 65693d747ca3..000000000000
--- a/sys-apps/systemd-utils/files/251-glibc-2.36.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-https://bugs.gentoo.org/863218
-https://github.com/systemd/systemd/issues/23984
-https://github.com/systemd/systemd/commit/3657d3a01c7e25ff86d7a4642065b367c4ff7484
-https://github.com/systemd/systemd/commit/0a58cd00454cc7b57b04f3a4a334584d743d7f7a
-
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sat, 23 Jul 2022 10:38:49 +0000
-Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve
- fsconfig_command/mount_attr conflict with glibc 2.36
-
---- a/meson.build
-+++ b/meson.build
-@@ -511,7 +511,6 @@ decl_headers = '''
- #include <uchar.h>
- #include <sys/mount.h>
- #include <sys/stat.h>
--#include <linux/fs.h>
- '''
- 
- foreach decl : ['char16_t',
-@@ -523,6 +522,17 @@ foreach decl : ['char16_t',
-         # We get -1 if the size cannot be determined
-         have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
- 
-+        if decl == 'struct mount_attr'
-+                if have
-+                        want_linux_fs_h = false
-+                else
-+                        have = cc.sizeof(decl,
-+                                         prefix : decl_headers + '#include <linux/fs.h>',
-+                                         args : '-D_GNU_SOURCE') > 0
-+                        want_linux_fs_h = have
-+                endif
-+        endif
-+
-         if decl == 'struct statx'
-                 if have
-                         want_linux_stat_h = false
-@@ -538,6 +548,7 @@ foreach decl : ['char16_t',
- endforeach
- 
- conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
-+conf.set10('WANT_LINUX_FS_H', want_linux_fs_h)
- 
- foreach ident : ['secure_getenv', '__secure_getenv']
-         conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
---- a/src/basic/fd-util.c
-+++ b/src/basic/fd-util.c
-@@ -3,7 +3,9 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <linux/btrfs.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- #include <linux/magic.h>
- #include <sys/ioctl.h>
- #include <sys/resource.h>
---- a/src/core/namespace.c
-+++ b/src/core/namespace.c
-@@ -7,7 +7,9 @@
- #include <sys/file.h>
- #include <sys/mount.h>
- #include <unistd.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- 
- #include "alloc-util.h"
- #include "base-filesystem.h"
---- a/src/shared/mount-util.c
-+++ b/src/shared/mount-util.c
-@@ -7,7 +7,9 @@
- #include <sys/statvfs.h>
- #include <unistd.h>
- #include <linux/loop.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- 
- #include "alloc-util.h"
- #include "chase-symlinks.h"
-
-From 0a58cd00454cc7b57b04f3a4a334584d743d7f7a Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Tue, 26 Jul 2022 20:03:12 +0900
-Subject: [PATCH] home: drop conflicted headers
-
-Fixes #24117.
---- a/src/basic/missing_fs.h
-+++ b/src/basic/missing_fs.h
-@@ -64,3 +64,8 @@
- #ifndef FS_PROJINHERIT_FL
- #define FS_PROJINHERIT_FL 0x20000000
- #endif
-+
-+/* linux/fscrypt.h */
-+#ifndef FS_KEY_DESCRIPTOR_SIZE
-+#define FS_KEY_DESCRIPTOR_SIZE 8
-+#endif
---- a/src/home/homework-cifs.c
-+++ b/src/home/homework-cifs.c
-@@ -1,5 +1,10 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-+#include <sys/mount.h>
-+#if WANT_LINUX_FS_H
-+#include <linux/fs.h>
-+#endif
-+
- #include "dirent-util.h"
- #include "fd-util.h"
- #include "fileio.h"
---- a/src/home/homework-luks.c
-+++ b/src/home/homework-luks.c
-@@ -4,7 +4,6 @@
- #include <poll.h>
- #include <sys/file.h>
- #include <sys/ioctl.h>
--#include <sys/mount.h>
- #include <sys/xattr.h>
- 
- #if HAVE_VALGRIND_MEMCHECK_H
---- a/src/home/homework-mount.c
-+++ b/src/home/homework-mount.c
-@@ -2,7 +2,9 @@
- 
- #include <sched.h>
- #include <sys/mount.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- 
- #include "alloc-util.h"
- #include "fd-util.h"
---- a/src/home/homework.h
-+++ b/src/home/homework.h
-@@ -1,13 +1,14 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- #pragma once
- 
--#include <linux/fs.h>
- #include <sys/vfs.h>
- 
- #include "sd-id128.h"
- 
-+#include "cryptsetup-util.h"
- #include "homework-password-cache.h"
- #include "loop-util.h"
-+#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */
- #include "missing_keyctl.h"
- #include "missing_syscall.h"
- #include "user-record.h"
-
diff --git a/sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch b/sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch
new file mode 100644
index 000000000000..bbe45f85dcf2
--- /dev/null
+++ b/sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch
@@ -0,0 +1,40 @@
+From: Sam James <sam@gentoo.org>
+Date: Tue, 24 May 2022 23:21:50 +0100
+Subject: [PATCH] Revert "Support -D_FORTIFY_SOURCE=3 by using
+ __builtin_dynamic_object_size."
+
+Breaks Clang (even without F_S=3).
+
+This reverts commit 0bd292567a543d124cd303f7dd61169a209cae64.
+
+Bug: https://bugs.gentoo.org/841770
+Bug: https://github.com/systemd/systemd/issues/23150
+--- a/src/basic/alloc-util.h
++++ b/src/basic/alloc-util.h
+@@ -174,23 +174,13 @@ void* greedy_realloc0(void **p, size_t need, size_t size);
+  * is compatible with _FORTIFY_SOURCES. If _FORTIFY_SOURCES is used many memory operations will take the
+  * object size as returned by __builtin_object_size() into account. Hence, let's return the smaller size of
+  * malloc_usable_size() and __builtin_object_size() here, so that we definitely operate in safe territory by
+- * both the compiler's and libc's standards. Note that _FORTIFY_SOURCES=3 handles also dynamically allocated
+- * objects and thus it's safer using __builtin_dynamic_object_size if _FORTIFY_SOURCES=3 is used (#22801).
+- * Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
++ * both the compiler's and libc's standards. Note that __builtin_object_size() evaluates to SIZE_MAX if the
++ * size cannot be determined, hence the MIN() expression should be safe with dynamically sized memory,
++ * too. Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
+  * __builtin_object_size() returns SIZE_MAX too, hence we also return a sensible value of 0 in this corner
+  * case. */
+-
+-#if defined __has_builtin
+-#  if __has_builtin(__builtin_dynamic_object_size)
+-#    define MALLOC_SIZEOF_SAFE(x) \
+-        MIN(malloc_usable_size(x), __builtin_dynamic_object_size(x, 0))
+-#  endif
+-#endif
+-
+-#ifndef MALLOC_SIZEOF_SAFE
+ #define MALLOC_SIZEOF_SAFE(x) \
+         MIN(malloc_usable_size(x), __builtin_object_size(x, 0))
+-#endif
+ 
+ /* Inspired by ELEMENTSOF() but operates on malloc()'ed memory areas: typesafely returns the number of items
+  * that fit into the specified memory block */
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
deleted file mode 100644
index 7c1f1c2f6a75..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
-	MY_P="systemd-stable-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
-	MY_P="systemd-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-250.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	selinux? ( sys-libs/libselinux:0= )
-	tmpfiles? (
-		acl? ( sys-apps/acl:0= )
-	)
-	udev? (
-		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-		virtual/libcrypt:=[${MULTILIB_USEDEP}]
-		acl? ( sys-apps/acl:0= )
-		kmod? ( >=sys-apps/kmod-15:0= )
-	)
-	!udev? (
-		>=sys-apps/util-linux-2.30:0=
-		sys-libs/libcap:0=
-		virtual/libcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	boot? (
-		>=sys-boot/gnu-efi-3.0.2
-	)
-	>=sys-kernel/linux-headers-3.11
-"
-RDEPEND="${COMMON_DEPEND}
-	boot? ( !<sys-boot/systemd-boot-250 )
-	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
-	udev? (
-		acct-group/audio
-		acct-group/cdrom
-		acct-group/dialout
-		acct-group/disk
-		acct-group/input
-		acct-group/kmem
-		acct-group/kvm
-		acct-group/lp
-		acct-group/render
-		acct-group/sgx
-		acct-group/tape
-		acct-group/tty
-		acct-group/video
-		!sys-apps/gentoo-systemd-integration
-		!sys-apps/hwids[udev]
-		!<sys-fs/udev-250
-		!sys-fs/eudev
-	)
-	!sys-apps/systemd
-"
-PDEPEND="
-	udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
-	)
-	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
-	fi
-	default
-
-	# Remove install_rpath; we link statically
-	local rpath_pattern="install_rpath : rootlibexecdir,"
-	grep -q -e "${rpath_pattern}" meson.build || die
-	sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
-	# When bumping to 251, please keep this, but add the revert patch
-	# like in sys-apps/systemd!
-	#
-	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
-	# wasn't backported to 250.x, but it turns out to break Clang
-	# anyway:  bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Dsysvinit-path=
-		$(meson_native_use_bool boot efi)
-		$(meson_native_use_bool boot gnu-efi)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool sysusers)
-		$(meson_use test tests)
-		$(meson_native_use_bool tmpfiles)
-		$(meson_use udev hwdb)
-
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
-		# Link staticly with libsystemd-shared
-		-Dlink-boot-shared=false
-		-Dlink-udev-shared=false
-
-		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
-		-Dstandalone-binaries=true
-
-		# Disable all optional features
-		-Dadm-group=false
-		-Danalyze=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbacklight=false
-		-Dbinfmt=false
-		-Dbzip2=false
-		-Dcoredump=false
-		-Ddbus=false
-		-Delfutils=false
-		-Denvironment-d=false
-		-Dfdisk=false
-		-Dgcrypt=false
-		-Dglib=false
-		-Dgshadow=false
-		-Dgnutls=false
-		-Dhibernate=false
-		-Dhostnamed=false
-		-Didn=false
-		-Dima=false
-		-Dinitrd=false
-		-Dfirstboot=false
-		-Dkernel-install=false
-		-Dldconfig=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibfido2=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlocaled=false
-		-Dlogind=false
-		-Dlz4=false
-		-Dmachined=false
-		-Dmicrohttpd=false
-		-Dnetworkd=false
-		-Dnscd=false
-		-Dnss-myhostname=false
-		-Dnss-resolve=false
-		-Dnss-systemd=false
-		-Doomd=false
-		-Dopenssl=false
-		-Dp11kit=false
-		-Dpam=false
-		-Dpcre2=false
-		-Dpolkit=false
-		-Dportabled=false
-		-Dpstore=false
-		-Dpwquality=false
-		-Drandomseed=false
-		-Dresolve=false
-		-Drfkill=false
-		-Dseccomp=false
-		-Dsmack=false
-		-Dsysext=false
-		-Dtimedated=false
-		-Dtimesyncd=false
-		-Dtpm=false
-		-Dqrencode=false
-		-Dquotacheck=false
-		-Duserdb=false
-		-Dutmp=false
-		-Dvconsole=false
-		-Dwheel-group=false
-		-Dxdg-autostart=false
-		-Dxkbcommon=false
-		-Dxz=false
-		-Dzlib=false
-		-Dzstd=false
-	)
-
-	if use tmpfiles || use udev; then
-		emesonargs+=( $(meson_native_use_bool acl) )
-	else
-		emesonargs+=( -Dacl=false )
-	fi
-
-	if use udev; then
-		emesonargs+=( $(meson_native_use_bool kmod) )
-	else
-		emesonargs+=( -Dkmod=false )
-	fi
-
-	if use elibc_musl; then
-		# Avoid redefinition of struct ethhdr.
-		append-cppflags -D__UAPI_DEF_ETHHDR=0
-	fi
-
-	if multilib_is_native_abi || use udev; then
-		meson_src_configure
-	fi
-}
-
-efi_arch() {
-	case "$(tc-arch)" in
-		amd64) echo x64 ;;
-		arm)   echo arm ;;
-		arm64) echo aa64 ;;
-		x86)   echo x86 ;;
-	esac
-}
-
-multilib_src_compile() {
-	local targets=()
-	if multilib_is_native_abi; then
-		if use boot; then
-			targets+=(
-				bootctl
-				man/bootctl.1
-				man/kernel-install.8
-				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
-				src/boot/efi/systemd-boot$(efi_arch).efi
-			)
-		fi
-		if use sysusers; then
-			targets+=(
-				systemd-sysusers.standalone
-				man/sysusers.d.5
-				man/systemd-sysusers.8
-			)
-			if use test; then
-				targets+=(
-					systemd-runtest.env
-				)
-			fi
-		fi
-		if use tmpfiles; then
-			targets+=(
-				systemd-tmpfiles.standalone
-				man/tmpfiles.d.5
-				man/systemd-tmpfiles.8
-			)
-			if use test; then
-				targets+=( test-tmpfiles )
-			fi
-		fi
-		if use udev; then
-			targets+=(
-				udevadm
-				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
-				src/udev/udev.pc
-				src/udev/v4l_id
-				man/udev.conf.5
-				man/systemd.link.5
-				man/hwdb.7
-				man/udev.7
-				man/systemd-hwdb.8
-				man/systemd-udevd.service.8
-				man/udevadm.8
-				hwdb.d/60-autosuspend-chromiumos.hwdb
-				rules.d/50-udev-default.rules
-				rules.d/64-btrfs.rules
-			)
-			if use test; then
-				targets+=(
-					# Used by udev-test.pl
-					systemd-detect-virt
-					test/sys
-					test-udev
-
-					test-fido-id-desc
-					test-udev-builtin
-					test-udev-event
-					test-udev-netlink
-					test-udev-node
-					test-udev-util
-				)
-			fi
-		fi
-	fi
-	if use udev; then
-		targets+=(
-			udev:shared_library
-			src/libudev/libudev.pc
-		)
-		if use test; then
-			targets+=(
-				test-libudev
-				test-libudev-sym
-				test-udev-device-thread
-			)
-		fi
-	fi
-	if multilib_is_native_abi || use udev; then
-		meson_src_compile "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	local tests=()
-	if multilib_is_native_abi; then
-		if use sysusers; then
-			tests+=(
-				test-sysusers.standalone
-			)
-		fi
-		if use tmpfiles; then
-			tests+=(
-				test-systemd-tmpfiles.standalone
-				test-tmpfiles
-			)
-		fi
-		if use udev; then
-			tests+=(
-				rule-syntax-check
-				test-fido-id-desc
-				test-udev-builtin
-				test-udev-event
-				test-udev-netlink
-				test-udev-node
-				test-udev-util
-			)
-			if [[ -w /dev ]]; then
-				tests+=( udev-test )
-			else
-				ewarn "Skipping udev-test (needs write access to /dev)"
-			fi
-		fi
-	fi
-	if use udev; then
-		tests+=(
-			test-libudev
-			test-libudev-sym
-			test-udev-device-thread
-		)
-	fi
-	if [[ ${#tests[@]} -ne 0 ]]; then
-		meson_src_test "${tests[@]}"
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use boot; then
-			into /usr
-			dobin bootctl
-			doman man/{bootctl.1,kernel-install.8}
-			insinto usr/lib/systemd/boot/efi
-			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
-		fi
-		if use sysusers; then
-			into /
-			newbin systemd-sysusers{.standalone,}
-			doman man/{systemd-sysusers.8,sysusers.d.5}
-		fi
-		if use tmpfiles; then
-			into /
-			newbin systemd-tmpfiles{.standalone,}
-			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-		fi
-		if use udev; then
-			into /
-			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-			exeinto /lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-			insinto /lib/udev/rules.d
-			doins rules.d/*.rules
-			insinto /lib/udev/hwdb.d
-			doins hwdb.d/*.hwdb
-			insinto /usr/share/pkgconfig
-			doins src/udev/udev.pc
-			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
-			newman man/systemd-udevd.service.8 systemd-udevd.8
-
-		fi
-	fi
-	if use udev; then
-		into /usr
-		dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
-		gen_usr_ldscript -a udev
-		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins src/libudev/libudev.pc
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use boot; then
-		into /usr
-		dobin src/kernel-install/kernel-install
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
-		dobashcomp shell-completion/bash/bootctl
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/{_bootctl,_kernel-install}
-	fi
-	if use tmpfiles; then
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_systemd-tmpfiles
-	fi
-	if use udev; then
-		doheader src/libudev/libudev.h
-		insinto /etc/udev
-		doins src/udev/udev.conf
-		keepdir /etc/udev/{hwdb.d,rules.d}
-		insinto /lib/systemd/network
-		doins network/99-default.link
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-		doins "${FILESDIR}"/40-gentoo.rules
-		insinto /lib/udev/hwdb.d
-		doins hwdb.d/*.hwdb
-		dobashcomp shell-completion/bash/udevadm
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_udevadm
-	fi
-}
-
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-	eend $?
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		add_service systemd-tmpfiles-setup-dev sysinit
-		add_service systemd-tmpfiles-setup boot
-	fi
-	if use udev; then
-		ebegin "Updating hwdb"
-		systemd-hwdb --root="${ROOT}" update
-		eend $?
-		udev_reload
-	fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-250.8.ebuild b/sys-apps/systemd-utils/systemd-utils-250.8.ebuild
deleted file mode 100644
index 9afc4a2e8c10..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-250.8.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
-	MY_P="systemd-stable-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
-	MY_P="systemd-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-250.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	selinux? ( sys-libs/libselinux:0= )
-	tmpfiles? (
-		acl? ( sys-apps/acl:0= )
-	)
-	udev? (
-		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-		virtual/libcrypt:=[${MULTILIB_USEDEP}]
-		acl? ( sys-apps/acl:0= )
-		kmod? ( >=sys-apps/kmod-15:0= )
-	)
-	!udev? (
-		>=sys-apps/util-linux-2.30:0=
-		sys-libs/libcap:0=
-		virtual/libcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	boot? (
-		>=sys-boot/gnu-efi-3.0.2
-	)
-	>=sys-kernel/linux-headers-3.11
-"
-RDEPEND="${COMMON_DEPEND}
-	boot? ( !<sys-boot/systemd-boot-250 )
-	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
-	udev? (
-		acct-group/audio
-		acct-group/cdrom
-		acct-group/dialout
-		acct-group/disk
-		acct-group/input
-		acct-group/kmem
-		acct-group/kvm
-		acct-group/lp
-		acct-group/render
-		acct-group/sgx
-		acct-group/tape
-		acct-group/tty
-		acct-group/video
-		!sys-apps/gentoo-systemd-integration
-		!sys-apps/hwids[udev]
-		!<sys-fs/udev-250
-		!sys-fs/eudev
-	)
-	!sys-apps/systemd
-"
-PDEPEND="
-	udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
-	)
-	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
-	fi
-	default
-
-	# Remove install_rpath; we link statically
-	local rpath_pattern="install_rpath : rootlibexecdir,"
-	grep -q -e "${rpath_pattern}" meson.build || die
-	sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
-	# When bumping to 251, please keep this, but add the revert patch
-	# like in sys-apps/systemd!
-	#
-	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
-	# wasn't backported to 250.x, but it turns out to break Clang
-	# anyway:  bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Dsysvinit-path=
-		$(meson_native_use_bool boot efi)
-		$(meson_native_use_bool boot gnu-efi)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool sysusers)
-		$(meson_use test tests)
-		$(meson_native_use_bool tmpfiles)
-		$(meson_use udev hwdb)
-
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
-		# Link staticly with libsystemd-shared
-		-Dlink-boot-shared=false
-		-Dlink-udev-shared=false
-
-		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
-		-Dstandalone-binaries=true
-
-		# Disable all optional features
-		-Dadm-group=false
-		-Danalyze=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbacklight=false
-		-Dbinfmt=false
-		-Dbzip2=false
-		-Dcoredump=false
-		-Ddbus=false
-		-Delfutils=false
-		-Denvironment-d=false
-		-Dfdisk=false
-		-Dgcrypt=false
-		-Dglib=false
-		-Dgshadow=false
-		-Dgnutls=false
-		-Dhibernate=false
-		-Dhostnamed=false
-		-Didn=false
-		-Dima=false
-		-Dinitrd=false
-		-Dfirstboot=false
-		-Dkernel-install=false
-		-Dldconfig=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibfido2=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlocaled=false
-		-Dlogind=false
-		-Dlz4=false
-		-Dmachined=false
-		-Dmicrohttpd=false
-		-Dnetworkd=false
-		-Dnscd=false
-		-Dnss-myhostname=false
-		-Dnss-resolve=false
-		-Dnss-systemd=false
-		-Doomd=false
-		-Dopenssl=false
-		-Dp11kit=false
-		-Dpam=false
-		-Dpcre2=false
-		-Dpolkit=false
-		-Dportabled=false
-		-Dpstore=false
-		-Dpwquality=false
-		-Drandomseed=false
-		-Dresolve=false
-		-Drfkill=false
-		-Dseccomp=false
-		-Dsmack=false
-		-Dsysext=false
-		-Dtimedated=false
-		-Dtimesyncd=false
-		-Dtpm=false
-		-Dqrencode=false
-		-Dquotacheck=false
-		-Duserdb=false
-		-Dutmp=false
-		-Dvconsole=false
-		-Dwheel-group=false
-		-Dxdg-autostart=false
-		-Dxkbcommon=false
-		-Dxz=false
-		-Dzlib=false
-		-Dzstd=false
-	)
-
-	if use tmpfiles || use udev; then
-		emesonargs+=( $(meson_native_use_bool acl) )
-	else
-		emesonargs+=( -Dacl=false )
-	fi
-
-	if use udev; then
-		emesonargs+=( $(meson_native_use_bool kmod) )
-	else
-		emesonargs+=( -Dkmod=false )
-	fi
-
-	if use elibc_musl; then
-		# Avoid redefinition of struct ethhdr.
-		append-cppflags -D__UAPI_DEF_ETHHDR=0
-	fi
-
-	if multilib_is_native_abi || use udev; then
-		meson_src_configure
-	fi
-}
-
-efi_arch() {
-	case "$(tc-arch)" in
-		amd64) echo x64 ;;
-		arm)   echo arm ;;
-		arm64) echo aa64 ;;
-		x86)   echo x86 ;;
-	esac
-}
-
-multilib_src_compile() {
-	local targets=()
-	if multilib_is_native_abi; then
-		if use boot; then
-			targets+=(
-				bootctl
-				man/bootctl.1
-				man/kernel-install.8
-				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
-				src/boot/efi/systemd-boot$(efi_arch).efi
-			)
-		fi
-		if use sysusers; then
-			targets+=(
-				systemd-sysusers.standalone
-				man/sysusers.d.5
-				man/systemd-sysusers.8
-			)
-			if use test; then
-				targets+=(
-					systemd-runtest.env
-				)
-			fi
-		fi
-		if use tmpfiles; then
-			targets+=(
-				systemd-tmpfiles.standalone
-				man/tmpfiles.d.5
-				man/systemd-tmpfiles.8
-			)
-			if use test; then
-				targets+=( test-tmpfiles )
-			fi
-		fi
-		if use udev; then
-			targets+=(
-				udevadm
-				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
-				src/udev/udev.pc
-				src/udev/v4l_id
-				man/udev.conf.5
-				man/systemd.link.5
-				man/hwdb.7
-				man/udev.7
-				man/systemd-hwdb.8
-				man/systemd-udevd.service.8
-				man/udevadm.8
-				hwdb.d/60-autosuspend-chromiumos.hwdb
-				rules.d/50-udev-default.rules
-				rules.d/64-btrfs.rules
-			)
-			if use test; then
-				targets+=(
-					# Used by udev-test.pl
-					systemd-detect-virt
-					test/sys
-					test-udev
-
-					test-fido-id-desc
-					test-udev-builtin
-					test-udev-event
-					test-udev-netlink
-					test-udev-node
-					test-udev-util
-				)
-			fi
-		fi
-	fi
-	if use udev; then
-		targets+=(
-			udev:shared_library
-			src/libudev/libudev.pc
-		)
-		if use test; then
-			targets+=(
-				test-libudev
-				test-libudev-sym
-				test-udev-device-thread
-			)
-		fi
-	fi
-	if multilib_is_native_abi || use udev; then
-		meson_src_compile "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	local tests=()
-	if multilib_is_native_abi; then
-		if use sysusers; then
-			tests+=(
-				test-sysusers.standalone
-			)
-		fi
-		if use tmpfiles; then
-			tests+=(
-				test-systemd-tmpfiles.standalone
-				test-tmpfiles
-			)
-		fi
-		if use udev; then
-			tests+=(
-				rule-syntax-check
-				test-fido-id-desc
-				test-udev-builtin
-				test-udev-event
-				test-udev-netlink
-				test-udev-node
-				test-udev-util
-			)
-			if [[ -w /dev ]]; then
-				tests+=( udev-test )
-			else
-				ewarn "Skipping udev-test (needs write access to /dev)"
-			fi
-		fi
-	fi
-	if use udev; then
-		tests+=(
-			test-libudev
-			test-libudev-sym
-			test-udev-device-thread
-		)
-	fi
-	if [[ ${#tests[@]} -ne 0 ]]; then
-		meson_src_test "${tests[@]}"
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use boot; then
-			into /usr
-			dobin bootctl
-			doman man/{bootctl.1,kernel-install.8}
-			insinto usr/lib/systemd/boot/efi
-			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
-		fi
-		if use sysusers; then
-			into /
-			newbin systemd-sysusers{.standalone,}
-			doman man/{systemd-sysusers.8,sysusers.d.5}
-		fi
-		if use tmpfiles; then
-			into /
-			newbin systemd-tmpfiles{.standalone,}
-			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-		fi
-		if use udev; then
-			into /
-			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-			exeinto /lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-			insinto /lib/udev/rules.d
-			doins rules.d/*.rules
-			insinto /lib/udev/hwdb.d
-			doins hwdb.d/*.hwdb
-			insinto /usr/share/pkgconfig
-			doins src/udev/udev.pc
-			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
-			newman man/systemd-udevd.service.8 systemd-udevd.8
-
-		fi
-	fi
-	if use udev; then
-		into /usr
-		dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
-		gen_usr_ldscript -a udev
-		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins src/libudev/libudev.pc
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use boot; then
-		into /usr
-		dobin src/kernel-install/kernel-install
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
-		dobashcomp shell-completion/bash/bootctl
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/{_bootctl,_kernel-install}
-	fi
-	if use tmpfiles; then
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_systemd-tmpfiles
-	fi
-	if use udev; then
-		doheader src/libudev/libudev.h
-		insinto /etc/udev
-		doins src/udev/udev.conf
-		keepdir /etc/udev/{hwdb.d,rules.d}
-		insinto /lib/systemd/network
-		doins network/99-default.link
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-		doins "${FILESDIR}"/40-gentoo.rules
-		insinto /lib/udev/hwdb.d
-		doins hwdb.d/*.hwdb
-		dobashcomp shell-completion/bash/udevadm
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_udevadm
-	fi
-}
-
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-	eend $?
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		add_service systemd-tmpfiles-setup-dev sysinit
-		add_service systemd-tmpfiles-setup boot
-	fi
-	if use udev; then
-		ebegin "Updating hwdb"
-		systemd-hwdb --root="${ROOT}" update
-		eend $?
-		udev_reload
-	fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
deleted file mode 100644
index 357c32eb616c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
-	MY_P="systemd-stable-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
-	MY_P="systemd-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	elibc_musl? ( >=sys-libs/musl-1.2.3 )
-	selinux? ( sys-libs/libselinux:0= )
-	tmpfiles? (
-		acl? ( sys-apps/acl:0= )
-	)
-	udev? (
-		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-		virtual/libcrypt:=[${MULTILIB_USEDEP}]
-		acl? ( sys-apps/acl:0= )
-		kmod? ( >=sys-apps/kmod-15:0= )
-	)
-	!udev? (
-		>=sys-apps/util-linux-2.30:0=
-		sys-libs/libcap:0=
-		virtual/libcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.11
-	boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	boot? ( !<sys-boot/systemd-boot-250 )
-	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
-	udev? (
-		acct-group/audio
-		acct-group/cdrom
-		acct-group/dialout
-		acct-group/disk
-		acct-group/input
-		acct-group/kmem
-		acct-group/kvm
-		acct-group/lp
-		acct-group/render
-		acct-group/sgx
-		acct-group/tape
-		acct-group/tty
-		acct-group/video
-		!sys-apps/gentoo-systemd-integration
-		!sys-apps/hwids[udev]
-		!<sys-fs/udev-250
-		!sys-fs/eudev
-	)
-	!sys-apps/systemd
-"
-PDEPEND="
-	udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
-	local PATCHES=(
-	)
-	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
-	fi
-	default
-
-	# Remove install_rpath; we link statically
-	local rpath_pattern="install_rpath : rootlibexecdir,"
-	grep -q -e "${rpath_pattern}" meson.build || die
-	sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
-	# When bumping to 251, please keep this, but add the revert patch
-	# like in sys-apps/systemd!
-	#
-	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
-	# wasn't backported to 250.x, but it turns out to break Clang
-	# anyway:  bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dsysvinit-path=
-		$(meson_native_use_bool boot efi)
-		$(meson_native_use_bool boot gnu-efi)
-		$(meson_native_use_bool boot kernel-install)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool sysusers)
-		$(meson_use test tests)
-		$(meson_native_use_bool tmpfiles)
-		$(meson_use udev hwdb)
-
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
-		# Link staticly with libsystemd-shared
-		-Dlink-boot-shared=false
-		-Dlink-udev-shared=false
-
-		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
-		-Dstandalone-binaries=true
-
-		# Disable all optional features
-		-Dadm-group=false
-		-Danalyze=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbacklight=false
-		-Dbinfmt=false
-		-Dbzip2=false
-		-Dcoredump=false
-		-Ddbus=false
-		-Delfutils=false
-		-Denvironment-d=false
-		-Dfdisk=false
-		-Dgcrypt=false
-		-Dglib=false
-		-Dgshadow=false
-		-Dgnutls=false
-		-Dhibernate=false
-		-Dhostnamed=false
-		-Didn=false
-		-Dima=false
-		-Dinitrd=false
-		-Dfirstboot=false
-		-Dldconfig=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibfido2=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlocaled=false
-		-Dlogind=false
-		-Dlz4=false
-		-Dmachined=false
-		-Dmicrohttpd=false
-		-Dnetworkd=false
-		-Dnscd=false
-		-Dnss-myhostname=false
-		-Dnss-resolve=false
-		-Dnss-systemd=false
-		-Doomd=false
-		-Dopenssl=false
-		-Dp11kit=false
-		-Dpam=false
-		-Dpcre2=false
-		-Dpolkit=false
-		-Dportabled=false
-		-Dpstore=false
-		-Dpwquality=false
-		-Drandomseed=false
-		-Dresolve=false
-		-Drfkill=false
-		-Dseccomp=false
-		-Dsmack=false
-		-Dsysext=false
-		-Dtimedated=false
-		-Dtimesyncd=false
-		-Dtpm=false
-		-Dqrencode=false
-		-Dquotacheck=false
-		-Duserdb=false
-		-Dutmp=false
-		-Dvconsole=false
-		-Dwheel-group=false
-		-Dxdg-autostart=false
-		-Dxkbcommon=false
-		-Dxz=false
-		-Dzlib=false
-		-Dzstd=false
-	)
-
-	if use tmpfiles || use udev; then
-		emesonargs+=( $(meson_native_use_bool acl) )
-	else
-		emesonargs+=( -Dacl=false )
-	fi
-
-	if use udev; then
-		emesonargs+=( $(meson_native_use_bool kmod) )
-	else
-		emesonargs+=( -Dkmod=false )
-	fi
-
-	if use elibc_musl; then
-		# Avoid redefinition of struct ethhdr.
-		append-cppflags -D__UAPI_DEF_ETHHDR=0
-	fi
-
-	if multilib_is_native_abi || use udev; then
-		meson_src_configure
-	fi
-}
-
-efi_arch() {
-	case "$(tc-arch)" in
-		amd64) echo x64 ;;
-		arm)   echo arm ;;
-		arm64) echo aa64 ;;
-		x86)   echo x86 ;;
-	esac
-}
-
-multilib_src_compile() {
-	local targets=()
-	if multilib_is_native_abi; then
-		if use boot; then
-			targets+=(
-				bootctl
-				kernel-install
-				man/bootctl.1
-				man/kernel-install.8
-				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
-				src/boot/efi/systemd-boot$(efi_arch).efi
-			)
-		fi
-		if use sysusers; then
-			targets+=(
-				systemd-sysusers.standalone
-				man/sysusers.d.5
-				man/systemd-sysusers.8
-			)
-			if use test; then
-				targets+=(
-					systemd-runtest.env
-				)
-			fi
-		fi
-		if use tmpfiles; then
-			targets+=(
-				systemd-tmpfiles.standalone
-				man/tmpfiles.d.5
-				man/systemd-tmpfiles.8
-			)
-			if use test; then
-				targets+=( test-tmpfiles )
-			fi
-		fi
-		if use udev; then
-			targets+=(
-				udevadm
-				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
-				src/udev/udev.pc
-				src/udev/v4l_id
-				man/udev.conf.5
-				man/systemd.link.5
-				man/hwdb.7
-				man/udev.7
-				man/systemd-hwdb.8
-				man/systemd-udevd.service.8
-				man/udevadm.8
-				hwdb.d/60-autosuspend-chromiumos.hwdb
-				rules.d/50-udev-default.rules
-				rules.d/64-btrfs.rules
-			)
-			if use test; then
-				targets+=(
-					# Used by udev-test.pl
-					systemd-detect-virt
-					test/sys
-					test-udev
-
-					test-fido-id-desc
-					test-udev-builtin
-					test-udev-event
-					test-udev-netlink
-					test-udev-node
-					test-udev-util
-				)
-			fi
-		fi
-	fi
-	if use udev; then
-		targets+=(
-			udev:shared_library
-			src/libudev/libudev.pc
-		)
-		if use test; then
-			targets+=(
-				test-libudev
-				test-libudev-sym
-				test-udev-device-thread
-			)
-		fi
-	fi
-	if multilib_is_native_abi || use udev; then
-		meson_src_compile "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	local tests=()
-	if multilib_is_native_abi; then
-		if use sysusers; then
-			tests+=(
-				test-sysusers.standalone
-			)
-		fi
-		if use tmpfiles; then
-			tests+=(
-				test-systemd-tmpfiles.standalone
-				test-tmpfiles
-			)
-		fi
-		if use udev; then
-			tests+=(
-				rule-syntax-check
-				test-fido-id-desc
-				test-udev-builtin
-				test-udev-event
-				test-udev-netlink
-				test-udev-node
-				test-udev-util
-			)
-			if [[ -w /dev ]]; then
-				tests+=( udev-test )
-			else
-				ewarn "Skipping udev-test (needs write access to /dev)"
-			fi
-		fi
-	fi
-	if use udev; then
-		tests+=(
-			test-libudev
-			test-libudev-sym
-			test-udev-device-thread
-		)
-	fi
-	if [[ ${#tests[@]} -ne 0 ]]; then
-		meson_src_test "${tests[@]}"
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use boot; then
-			into /usr
-			dobin bootctl kernel-install
-			doman man/{bootctl.1,kernel-install.8}
-			insinto usr/lib/systemd/boot/efi
-			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
-		fi
-		if use sysusers; then
-			into /
-			newbin systemd-sysusers{.standalone,}
-			doman man/{systemd-sysusers.8,sysusers.d.5}
-		fi
-		if use tmpfiles; then
-			into /
-			newbin systemd-tmpfiles{.standalone,}
-			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-		fi
-		if use udev; then
-			into /
-			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-			exeinto /lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-			insinto /lib/udev/rules.d
-			doins rules.d/*.rules
-
-			insinto /lib/udev/hwdb.d
-			doins hwdb.d/*.hwdb
-
-			insinto /usr/share/pkgconfig
-			doins src/udev/udev.pc
-
-			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
-			newman man/systemd-udevd.service.8 systemd-udevd.8
-		fi
-	fi
-	if use udev; then
-		meson_install --no-rebuild --tags libudev
-		gen_usr_ldscript -a udev
-		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins src/libudev/libudev.pc
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use boot; then
-		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
-		dobashcomp shell-completion/bash/bootctl
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/{_bootctl,_kernel-install}
-	fi
-	if use tmpfiles; then
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_systemd-tmpfiles
-	fi
-	if use udev; then
-		doheader src/libudev/libudev.h
-
-		insinto /etc/udev
-		doins src/udev/udev.conf
-		keepdir /etc/udev/{hwdb.d,rules.d}
-
-		insinto /lib/systemd/network
-		doins network/99-default.link
-
-		# Remove to avoid conflict with elogind
-		# https://bugs.gentoo.org/856433
-		rm rules.d/70-power-switch.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-		doins "${FILESDIR}"/40-gentoo.rules
-
-		insinto /lib/udev/hwdb.d
-		doins hwdb.d/*.hwdb
-
-		dobashcomp shell-completion/bash/udevadm
-
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_udevadm
-	fi
-}
-
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-	eend $?
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		add_service systemd-tmpfiles-setup-dev sysinit
-		add_service systemd-tmpfiles-setup boot
-	fi
-	if use udev; then
-		ebegin "Updating hwdb"
-		systemd-hwdb --root="${ROOT}" update
-		eend $?
-		udev_reload
-	fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
deleted file mode 100644
index 7aeb8a9076f5..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
-	MY_P="systemd-stable-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
-	MY_P="systemd-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	elibc_musl? ( >=sys-libs/musl-1.2.3 )
-	selinux? ( sys-libs/libselinux:0= )
-	tmpfiles? (
-		acl? ( sys-apps/acl:0= )
-	)
-	udev? (
-		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-		virtual/libcrypt:=[${MULTILIB_USEDEP}]
-		acl? ( sys-apps/acl:0= )
-		kmod? ( >=sys-apps/kmod-15:0= )
-	)
-	!udev? (
-		>=sys-apps/util-linux-2.30:0=
-		sys-libs/libcap:0=
-		virtual/libcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.11
-	boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	boot? ( !<sys-boot/systemd-boot-250 )
-	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
-	udev? (
-		acct-group/audio
-		acct-group/cdrom
-		acct-group/dialout
-		acct-group/disk
-		acct-group/input
-		acct-group/kmem
-		acct-group/kvm
-		acct-group/lp
-		acct-group/render
-		acct-group/sgx
-		acct-group/tape
-		acct-group/tty
-		acct-group/video
-		!sys-apps/gentoo-systemd-integration
-		!sys-apps/hwids[udev]
-		!<sys-fs/udev-250
-		!sys-fs/eudev
-	)
-	!sys-apps/systemd
-"
-PDEPEND="
-	udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
-	local PATCHES=(
-		# bug #863218
-		"${FILESDIR}/251-glibc-2.36.patch"
-	)
-
-	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
-		# Applied upstream in 251.3
-		rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
-	fi
-	default
-
-	# Remove install_rpath; we link statically
-	local rpath_pattern="install_rpath : rootlibexecdir,"
-	grep -q -e "${rpath_pattern}" meson.build || die
-	sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
-	# When bumping to 251, please keep this, but add the revert patch
-	# like in sys-apps/systemd!
-	#
-	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
-	# wasn't backported to 250.x, but it turns out to break Clang
-	# anyway:  bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dsysvinit-path=
-		$(meson_native_use_bool boot efi)
-		$(meson_native_use_bool boot gnu-efi)
-		$(meson_native_use_bool boot kernel-install)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool sysusers)
-		$(meson_use test tests)
-		$(meson_native_use_bool tmpfiles)
-		$(meson_use udev hwdb)
-
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
-		# Link staticly with libsystemd-shared
-		-Dlink-boot-shared=false
-		-Dlink-udev-shared=false
-
-		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
-		-Dstandalone-binaries=true
-
-		# Disable all optional features
-		-Dadm-group=false
-		-Danalyze=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbacklight=false
-		-Dbinfmt=false
-		-Dbzip2=false
-		-Dcoredump=false
-		-Ddbus=false
-		-Delfutils=false
-		-Denvironment-d=false
-		-Dfdisk=false
-		-Dgcrypt=false
-		-Dglib=false
-		-Dgshadow=false
-		-Dgnutls=false
-		-Dhibernate=false
-		-Dhostnamed=false
-		-Didn=false
-		-Dima=false
-		-Dinitrd=false
-		-Dfirstboot=false
-		-Dldconfig=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibfido2=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlocaled=false
-		-Dlogind=false
-		-Dlz4=false
-		-Dmachined=false
-		-Dmicrohttpd=false
-		-Dnetworkd=false
-		-Dnscd=false
-		-Dnss-myhostname=false
-		-Dnss-resolve=false
-		-Dnss-systemd=false
-		-Doomd=false
-		-Dopenssl=false
-		-Dp11kit=false
-		-Dpam=false
-		-Dpcre2=false
-		-Dpolkit=false
-		-Dportabled=false
-		-Dpstore=false
-		-Dpwquality=false
-		-Drandomseed=false
-		-Dresolve=false
-		-Drfkill=false
-		-Dseccomp=false
-		-Dsmack=false
-		-Dsysext=false
-		-Dtimedated=false
-		-Dtimesyncd=false
-		-Dtpm=false
-		-Dqrencode=false
-		-Dquotacheck=false
-		-Duserdb=false
-		-Dutmp=false
-		-Dvconsole=false
-		-Dwheel-group=false
-		-Dxdg-autostart=false
-		-Dxkbcommon=false
-		-Dxz=false
-		-Dzlib=false
-		-Dzstd=false
-	)
-
-	if use tmpfiles || use udev; then
-		emesonargs+=( $(meson_native_use_bool acl) )
-	else
-		emesonargs+=( -Dacl=false )
-	fi
-
-	if use udev; then
-		emesonargs+=( $(meson_native_use_bool kmod) )
-	else
-		emesonargs+=( -Dkmod=false )
-	fi
-
-	if use elibc_musl; then
-		# Avoid redefinition of struct ethhdr.
-		append-cppflags -D__UAPI_DEF_ETHHDR=0
-	fi
-
-	if multilib_is_native_abi || use udev; then
-		meson_src_configure
-	fi
-}
-
-efi_arch() {
-	case "$(tc-arch)" in
-		amd64) echo x64 ;;
-		arm)   echo arm ;;
-		arm64) echo aa64 ;;
-		x86)   echo x86 ;;
-	esac
-}
-
-multilib_src_compile() {
-	local targets=()
-	if multilib_is_native_abi; then
-		if use boot; then
-			targets+=(
-				bootctl
-				kernel-install
-				man/bootctl.1
-				man/kernel-install.8
-				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
-				src/boot/efi/systemd-boot$(efi_arch).efi
-			)
-		fi
-		if use sysusers; then
-			targets+=(
-				systemd-sysusers.standalone
-				man/sysusers.d.5
-				man/systemd-sysusers.8
-			)
-			if use test; then
-				targets+=(
-					systemd-runtest.env
-				)
-			fi
-		fi
-		if use tmpfiles; then
-			targets+=(
-				systemd-tmpfiles.standalone
-				man/tmpfiles.d.5
-				man/systemd-tmpfiles.8
-			)
-			if use test; then
-				targets+=( test-tmpfiles )
-			fi
-		fi
-		if use udev; then
-			targets+=(
-				udevadm
-				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
-				src/udev/udev.pc
-				src/udev/v4l_id
-				man/udev.conf.5
-				man/systemd.link.5
-				man/hwdb.7
-				man/udev.7
-				man/systemd-hwdb.8
-				man/systemd-udevd.service.8
-				man/udevadm.8
-				hwdb.d/60-autosuspend-chromiumos.hwdb
-				rules.d/50-udev-default.rules
-				rules.d/64-btrfs.rules
-			)
-			if use test; then
-				targets+=(
-					# Used by udev-test.pl
-					systemd-detect-virt
-					test/sys
-					test-udev
-
-					test-fido-id-desc
-					test-udev-builtin
-					test-udev-event
-					test-udev-netlink
-					test-udev-node
-					test-udev-util
-				)
-			fi
-		fi
-	fi
-	if use udev; then
-		targets+=(
-			udev:shared_library
-			src/libudev/libudev.pc
-		)
-		if use test; then
-			targets+=(
-				test-libudev
-				test-libudev-sym
-				test-udev-device-thread
-			)
-		fi
-	fi
-	if multilib_is_native_abi || use udev; then
-		meson_src_compile "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	local tests=()
-	if multilib_is_native_abi; then
-		if use sysusers; then
-			tests+=(
-				test-sysusers.standalone
-			)
-		fi
-		if use tmpfiles; then
-			tests+=(
-				test-systemd-tmpfiles.standalone
-				test-tmpfiles
-			)
-		fi
-		if use udev; then
-			tests+=(
-				rule-syntax-check
-				test-fido-id-desc
-				test-udev-builtin
-				test-udev-event
-				test-udev-netlink
-				test-udev-node
-				test-udev-util
-			)
-			if [[ -w /dev ]]; then
-				tests+=( udev-test )
-			else
-				ewarn "Skipping udev-test (needs write access to /dev)"
-			fi
-		fi
-	fi
-	if use udev; then
-		tests+=(
-			test-libudev
-			test-libudev-sym
-			test-udev-device-thread
-		)
-	fi
-	if [[ ${#tests[@]} -ne 0 ]]; then
-		meson_src_test "${tests[@]}"
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use boot; then
-			into /usr
-			dobin bootctl kernel-install
-			doman man/{bootctl.1,kernel-install.8}
-			insinto usr/lib/systemd/boot/efi
-			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
-		fi
-		if use sysusers; then
-			into /
-			newbin systemd-sysusers{.standalone,}
-			doman man/{systemd-sysusers.8,sysusers.d.5}
-		fi
-		if use tmpfiles; then
-			into /
-			newbin systemd-tmpfiles{.standalone,}
-			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-		fi
-		if use udev; then
-			into /
-			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-			exeinto /lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-			insinto /lib/udev/rules.d
-			doins rules.d/*.rules
-
-			insinto /lib/udev/hwdb.d
-			doins hwdb.d/*.hwdb
-
-			insinto /usr/share/pkgconfig
-			doins src/udev/udev.pc
-
-			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
-			newman man/systemd-udevd.service.8 systemd-udevd.8
-		fi
-	fi
-	if use udev; then
-		meson_install --no-rebuild --tags libudev
-		gen_usr_ldscript -a udev
-		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins src/libudev/libudev.pc
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use boot; then
-		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
-		dobashcomp shell-completion/bash/bootctl
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/{_bootctl,_kernel-install}
-	fi
-	if use tmpfiles; then
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_systemd-tmpfiles
-	fi
-	if use udev; then
-		doheader src/libudev/libudev.h
-
-		insinto /etc/udev
-		doins src/udev/udev.conf
-		keepdir /etc/udev/{hwdb.d,rules.d}
-
-		insinto /lib/systemd/network
-		doins network/99-default.link
-
-		# Remove to avoid conflict with elogind
-		# https://bugs.gentoo.org/856433
-		rm rules.d/70-power-switch.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-		doins "${FILESDIR}"/40-gentoo.rules
-
-		insinto /lib/udev/hwdb.d
-		doins hwdb.d/*.hwdb
-
-		dobashcomp shell-completion/bash/udevadm
-
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_udevadm
-	fi
-}
-
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-	eend $?
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		add_service systemd-tmpfiles-setup-dev sysinit
-		add_service systemd-tmpfiles-setup boot
-	fi
-	if use udev; then
-		ebegin "Updating hwdb"
-		systemd-hwdb --root="${ROOT}" update
-		eend $?
-		udev_reload
-	fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
index 9cb9d0cb2ceb..9aa951a441cd 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
@@ -105,6 +105,8 @@ QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 
 src_prepare() {
 	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
 	)
 
 	if use elibc_musl; then
@@ -120,7 +122,7 @@ src_prepare() {
 	sed -i -e "/${rpath_pattern}/d" meson.build || die
 }
 
-multilib_src_configure() {
+src_configure() {
 	# When bumping to 251, please keep this, but add the revert patch
 	# like in sys-apps/systemd!
 	#
@@ -140,6 +142,10 @@ multilib_src_configure() {
 		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	local emesonargs=(
 		$(meson_use split-usr)
 		$(meson_use split-usr split-bin)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
deleted file mode 100644
index d66f463cc001..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
-	MY_P="systemd-stable-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
-	MY_P="systemd-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	elibc_musl? ( >=sys-libs/musl-1.2.3 )
-	selinux? ( sys-libs/libselinux:0= )
-	tmpfiles? (
-		acl? ( sys-apps/acl:0= )
-	)
-	udev? (
-		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-		virtual/libcrypt:=[${MULTILIB_USEDEP}]
-		acl? ( sys-apps/acl:0= )
-		kmod? ( >=sys-apps/kmod-15:0= )
-	)
-	!udev? (
-		>=sys-apps/util-linux-2.30:0=
-		sys-libs/libcap:0=
-		virtual/libcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.11
-	boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	boot? ( !<sys-boot/systemd-boot-250 )
-	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
-	udev? (
-		acct-group/audio
-		acct-group/cdrom
-		acct-group/dialout
-		acct-group/disk
-		acct-group/input
-		acct-group/kmem
-		acct-group/kvm
-		acct-group/lp
-		acct-group/render
-		acct-group/sgx
-		acct-group/tape
-		acct-group/tty
-		acct-group/video
-		!sys-apps/gentoo-systemd-integration
-		!sys-apps/hwids[udev]
-		!<sys-fs/udev-250
-		!sys-fs/eudev
-	)
-	!sys-apps/systemd
-"
-PDEPEND="
-	udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
-	local PATCHES=(
-	)
-
-	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
-		# Applied upstream in 251.3
-		rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
-	fi
-	default
-
-	# Remove install_rpath; we link statically
-	local rpath_pattern="install_rpath : rootlibexecdir,"
-	grep -q -e "${rpath_pattern}" meson.build || die
-	sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
-	# When bumping to 251, please keep this, but add the revert patch
-	# like in sys-apps/systemd!
-	#
-	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
-	# wasn't backported to 250.x, but it turns out to break Clang
-	# anyway:  bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dsysvinit-path=
-		$(meson_native_use_bool boot efi)
-		$(meson_native_use_bool boot gnu-efi)
-		$(meson_native_use_bool boot kernel-install)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool sysusers)
-		$(meson_use test tests)
-		$(meson_native_use_bool tmpfiles)
-		$(meson_use udev hwdb)
-
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
-		# Link staticly with libsystemd-shared
-		-Dlink-boot-shared=false
-		-Dlink-udev-shared=false
-
-		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
-		-Dstandalone-binaries=true
-
-		# Disable all optional features
-		-Dadm-group=false
-		-Danalyze=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbacklight=false
-		-Dbinfmt=false
-		-Dbzip2=false
-		-Dcoredump=false
-		-Ddbus=false
-		-Delfutils=false
-		-Denvironment-d=false
-		-Dfdisk=false
-		-Dgcrypt=false
-		-Dglib=false
-		-Dgshadow=false
-		-Dgnutls=false
-		-Dhibernate=false
-		-Dhostnamed=false
-		-Didn=false
-		-Dima=false
-		-Dinitrd=false
-		-Dfirstboot=false
-		-Dldconfig=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibfido2=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlocaled=false
-		-Dlogind=false
-		-Dlz4=false
-		-Dmachined=false
-		-Dmicrohttpd=false
-		-Dnetworkd=false
-		-Dnscd=false
-		-Dnss-myhostname=false
-		-Dnss-resolve=false
-		-Dnss-systemd=false
-		-Doomd=false
-		-Dopenssl=false
-		-Dp11kit=false
-		-Dpam=false
-		-Dpcre2=false
-		-Dpolkit=false
-		-Dportabled=false
-		-Dpstore=false
-		-Dpwquality=false
-		-Drandomseed=false
-		-Dresolve=false
-		-Drfkill=false
-		-Dseccomp=false
-		-Dsmack=false
-		-Dsysext=false
-		-Dtimedated=false
-		-Dtimesyncd=false
-		-Dtpm=false
-		-Dqrencode=false
-		-Dquotacheck=false
-		-Duserdb=false
-		-Dutmp=false
-		-Dvconsole=false
-		-Dwheel-group=false
-		-Dxdg-autostart=false
-		-Dxkbcommon=false
-		-Dxz=false
-		-Dzlib=false
-		-Dzstd=false
-	)
-
-	if use tmpfiles || use udev; then
-		emesonargs+=( $(meson_native_use_bool acl) )
-	else
-		emesonargs+=( -Dacl=false )
-	fi
-
-	if use udev; then
-		emesonargs+=( $(meson_native_use_bool kmod) )
-	else
-		emesonargs+=( -Dkmod=false )
-	fi
-
-	if use elibc_musl; then
-		# Avoid redefinition of struct ethhdr.
-		append-cppflags -D__UAPI_DEF_ETHHDR=0
-	fi
-
-	if multilib_is_native_abi || use udev; then
-		meson_src_configure
-	fi
-}
-
-efi_arch() {
-	case "$(tc-arch)" in
-		amd64) echo x64 ;;
-		arm)   echo arm ;;
-		arm64) echo aa64 ;;
-		x86)   echo x86 ;;
-	esac
-}
-
-multilib_src_compile() {
-	local targets=()
-	if multilib_is_native_abi; then
-		if use boot; then
-			targets+=(
-				bootctl
-				kernel-install
-				man/bootctl.1
-				man/kernel-install.8
-				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
-				src/boot/efi/systemd-boot$(efi_arch).efi
-			)
-		fi
-		if use sysusers; then
-			targets+=(
-				systemd-sysusers.standalone
-				man/sysusers.d.5
-				man/systemd-sysusers.8
-			)
-			if use test; then
-				targets+=(
-					systemd-runtest.env
-				)
-			fi
-		fi
-		if use tmpfiles; then
-			targets+=(
-				systemd-tmpfiles.standalone
-				man/tmpfiles.d.5
-				man/systemd-tmpfiles.8
-			)
-			if use test; then
-				targets+=( test-tmpfiles )
-			fi
-		fi
-		if use udev; then
-			targets+=(
-				udevadm
-				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
-				src/udev/udev.pc
-				src/udev/v4l_id
-				man/udev.conf.5
-				man/systemd.link.5
-				man/hwdb.7
-				man/udev.7
-				man/systemd-hwdb.8
-				man/systemd-udevd.service.8
-				man/udevadm.8
-				hwdb.d/60-autosuspend-chromiumos.hwdb
-				rules.d/50-udev-default.rules
-				rules.d/64-btrfs.rules
-			)
-			if use test; then
-				targets+=(
-					# Used by udev-test.pl
-					systemd-detect-virt
-					test/sys
-					test-udev
-
-					test-fido-id-desc
-					test-udev-builtin
-					test-udev-event
-					test-udev-netlink
-					test-udev-node
-					test-udev-util
-				)
-			fi
-		fi
-	fi
-	if use udev; then
-		targets+=(
-			udev:shared_library
-			src/libudev/libudev.pc
-		)
-		if use test; then
-			targets+=(
-				test-libudev
-				test-libudev-sym
-				test-udev-device-thread
-			)
-		fi
-	fi
-	if multilib_is_native_abi || use udev; then
-		meson_src_compile "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	local tests=()
-	if multilib_is_native_abi; then
-		if use sysusers; then
-			tests+=(
-				test-sysusers.standalone
-			)
-		fi
-		if use tmpfiles; then
-			tests+=(
-				test-systemd-tmpfiles.standalone
-				test-tmpfiles
-			)
-		fi
-		if use udev; then
-			tests+=(
-				rule-syntax-check
-				test-fido-id-desc
-				test-udev-builtin
-				test-udev-event
-				test-udev-netlink
-				test-udev-node
-				test-udev-util
-			)
-			if [[ -w /dev ]]; then
-				tests+=( udev-test )
-			else
-				ewarn "Skipping udev-test (needs write access to /dev)"
-			fi
-		fi
-	fi
-	if use udev; then
-		tests+=(
-			test-libudev
-			test-libudev-sym
-			test-udev-device-thread
-		)
-	fi
-	if [[ ${#tests[@]} -ne 0 ]]; then
-		meson_src_test "${tests[@]}"
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use boot; then
-			into /usr
-			dobin bootctl kernel-install
-			doman man/{bootctl.1,kernel-install.8}
-			insinto usr/lib/systemd/boot/efi
-			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
-		fi
-		if use sysusers; then
-			into /
-			newbin systemd-sysusers{.standalone,}
-			doman man/{systemd-sysusers.8,sysusers.d.5}
-		fi
-		if use tmpfiles; then
-			into /
-			newbin systemd-tmpfiles{.standalone,}
-			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-		fi
-		if use udev; then
-			into /
-			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-			exeinto /lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-			insinto /lib/udev/rules.d
-			doins rules.d/*.rules
-
-			insinto /lib/udev/hwdb.d
-			doins hwdb.d/*.hwdb
-
-			insinto /usr/share/pkgconfig
-			doins src/udev/udev.pc
-
-			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
-			newman man/systemd-udevd.service.8 systemd-udevd.8
-		fi
-	fi
-	if use udev; then
-		meson_install --no-rebuild --tags libudev
-		gen_usr_ldscript -a udev
-		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins src/libudev/libudev.pc
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use boot; then
-		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
-		dobashcomp shell-completion/bash/bootctl
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/{_bootctl,_kernel-install}
-	fi
-	if use tmpfiles; then
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_systemd-tmpfiles
-	fi
-	if use udev; then
-		doheader src/libudev/libudev.h
-
-		insinto /etc/udev
-		doins src/udev/udev.conf
-		keepdir /etc/udev/{hwdb.d,rules.d}
-
-		insinto /lib/systemd/network
-		doins network/99-default.link
-
-		# Remove to avoid conflict with elogind
-		# https://bugs.gentoo.org/856433
-		rm rules.d/70-power-switch.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-		doins "${FILESDIR}"/40-gentoo.rules
-
-		insinto /lib/udev/hwdb.d
-		doins hwdb.d/*.hwdb
-
-		dobashcomp shell-completion/bash/udevadm
-
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_udevadm
-	fi
-}
-
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-	eend $?
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		add_service systemd-tmpfiles-setup-dev sysinit
-		add_service systemd-tmpfiles-setup boot
-	fi
-	if use udev; then
-		ebegin "Updating hwdb"
-		systemd-hwdb --root="${ROOT}" update
-		eend $?
-		udev_reload
-	fi
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index bcf35bbe55f1..cc795b817ca7 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,3 @@
-AUX 251-format-string.patch 1038 BLAKE2B 2b7400516fd93bdaa887e6203b44e656ccc27ddd963264c2ae1a360c5899cbd42417e66f72fb8c02366a64371257d782d9c34e5288b17e357edebdb55da939c8 SHA512 d300bdcad16485a92c80df575c403fabbdcd4e8c71251e56147b0d85c2a2e8d271eb055b5f188a184cb652c22ce428176355f322e679b88bb8db90610e63c1a4
 AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
@@ -6,10 +5,8 @@ AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed6
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
-EBUILD systemd-251.2.ebuild 15630 BLAKE2B e107322c07f313e0ec5bffaaace81074c71ad7d8ec33d71382ba9726552b0ebd587b4cd8b3b52093deb38e3d11b115eb41854cc76a43e9794e08eef0d724a30a SHA512 1b9cd6a6dd45185f40272a29a06bcd8eee8de4a0d9a2469aaf487d3bf476dee439170ee089bedce41abbe83bf98bc7f9ed752dcda441eff13bf60c41e2caf005
 EBUILD systemd-251.3.ebuild 15507 BLAKE2B a5b9463fe2f440b01ab987b134fb147f88a811393e8122f2e404ca8163c7805cf42844292da3dbed72140e188958ccd67f11fc000c94b2e76aea0054a7a0606e SHA512 d1cd4e249b30fe9f975c4a70d7efd08b718dab197d84de621ab2e407299de764a1b47dc7d5df60028e3a2a5feedc9824b5d295a71c5583c369cc8283565de281
 EBUILD systemd-251.4.ebuild 15443 BLAKE2B 502dd6292361c144bb752841e79b7cef71ce3775d434741e4de1cc3d1570b0bb005a83b0d9ff94ca2b02d68fa6c56d33663418c535bcffe89dfcfa25f58fe949 SHA512 4286e117adfcd6da2d491fda1f628d504680c235e41e7a25e4cd6e1998405afc44fc59e3c05f3e2c1c36dc5f2e9293e4c77c5211b5ad47051fa3ced6d33bec97
 EBUILD systemd-9999.ebuild 15310 BLAKE2B 07caf06f5d1934290d36b28c8d02966150c44ac6e5541031873ff50f8d484e40c750d1f7d66bc4fc5725eeb0e003dac7028dea9277a8049d2faeb3eb1ec0ee8b SHA512 dbf0fb2e042f7deaad3c1fd3be5a5d1ce38b88c898b77e1c03754e49961fbb4a04b4a18bdb34167b731b1607f2fadf207b3b1ca085596eb40fad6e91993bf0e4
diff --git a/sys-apps/systemd/files/251-format-string.patch b/sys-apps/systemd/files/251-format-string.patch
deleted file mode 100644
index f36cc5d657f3..000000000000
--- a/sys-apps/systemd/files/251-format-string.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 08e86b15fc22a8e9f1ee0a791dfd35b2fc25e4c4 Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <daan.j.demeyer@gmail.com>
-Date: Sun, 22 May 2022 14:36:07 +0200
-Subject: [PATCH] coredump: Fix format string type mismatch
-
-Fixes #23471
----
- src/coredump/coredump.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
-index c9747416ad3c..994d968d871b 100644
---- a/src/coredump/coredump.c
-+++ b/src/coredump/coredump.c
-@@ -512,8 +512,8 @@ static int save_external_coredump(
- 
-         if (truncated)
-                 log_struct(LOG_INFO,
--                           LOG_MESSAGE("Core file was truncated to %zu bytes.", max_size),
--                           "SIZE_LIMIT=%zu", max_size,
-+                           LOG_MESSAGE("Core file was truncated to %"PRIu64" bytes.", max_size),
-+                           "SIZE_LIMIT=%"PRIu64, max_size,
-                            "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR);
- 
-         r = fix_permissions(fd, tmp, fn, context, uid);
diff --git a/sys-apps/systemd/systemd-251.2.ebuild b/sys-apps/systemd/systemd-251.2.ebuild
deleted file mode 100644
index ec03de9fc1b8..000000000000
--- a/sys-apps/systemd/systemd-251.2.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://systemd.io/"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
-	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
-	dns-over-tls? ( || ( gnutls openssl ) )
-	homed? ( cryptsetup pam openssl )
-	importd? ( curl lzma || ( gcrypt openssl ) )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
-	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	iptables? ( net-firewall/iptables:0= )
-	openssl? ( >=dev-libs/openssl-1.1.0:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? (
-		sec-policy/selinux-base-policy[systemd]
-		sec-policy/selinux-ntp
-	)
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
-			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-
-		if kernel_is -ge 5 10 20; then
-			CONFIG_CHECK+=" ~KCMP"
-		else
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		fi
-
-		if kernel_is -ge 4 18; then
-			CONFIG_CHECK+=" ~AUTOFS_FS"
-		else
-			CONFIG_CHECK+=" ~AUTOFS4_FS"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}/251-format-string.patch"
-		# Breaks Clang. Revert the commit for now and force off F_S=3.
-		# bug #841770.
-		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	# Fails with split-usr.
-	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	# Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
-	# the upstream patch for it because it breaks Clang: bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		$(meson_native_use_bool gnutls)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool iptables libiptc)
-		$(meson_native_use_bool openssl)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index c3e44e088a68..588b8544be25 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index c3adaf6767c7..1ecb5d80217f 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,15 +2,17 @@ AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.22.13.tar.gz 36093191 BLAKE2B ca73ff8e3ce8f22041a38c7e0c52eaec171bae117dd4afde9e9ba952edb5b641d8b0dd472be6ac4aba8859595557e222b188c763bc7cdafd25ab35e4a0ccaa57 SHA512 29bda4adf6970ab2f18fb71a8b932360c27a6b6cb1d0d797ce99a0e8d8469548ac6f54e666a8c8717e5ac44344a9cd34c8dba1c1eeee2074cff88637f60fdf69
+DIST kubernetes-1.22.14.tar.gz 36106528 BLAKE2B 62c07e6d775827ad167db3abfc877cb04a19dd4fef655be69aa815975310b7c7df3c46cafe098b92bc5b01cff3af6ac9e55e05c3a831827185121e6303f40287 SHA512 96c5db11c07224a1cd2a86da21e38e95198a2584eb0657bea920a41ed16c369462e5aff130069230415c49787e99d4582a32dcbf4c79fb79cfc3ce7be37f0d52
 DIST kubernetes-1.23.10.tar.gz 38229682 BLAKE2B 706ea466b4148475321e20b47d2d7f45c5f8fbb50065374604000a72b35eb7732272dea64b521a8b4fb91cd0f05cf28391ca205693dd76bb6a79081a83d65894 SHA512 9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872
-DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
+DIST kubernetes-1.23.11.tar.gz 38238863 BLAKE2B 6c0a4cd85151f32f1755758fe82b1f734216632d677ddcb396126e71002151750bd84993120852c5de68e67915675fdb7b4168426a7d42f7ab774cdab96b5dd9 SHA512 160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2
 DIST kubernetes-1.24.4.tar.gz 37973948 BLAKE2B ee608211efd23507f3e98e00694bb7d90fcfcdf8c66847c0e437860f55ef4d9c8d20463e9d603b1c740d1ec5a6008dcd76bc129635d2765a16c4a69f75644ae8 SHA512 2478e4a114a0efaab530e9f61a61a3b94c9d586ab776519110578a0e127796b737149c5ff0896280f84dd08c972333623fb6aeac5e9bf7f7ebf86f1ee1ba5a05
+DIST kubernetes-1.24.5.tar.gz 37984125 BLAKE2B 2b474f002336a505a0f366173a33cfe6d316a262c527b53aa449180eacfa52a5e71d8067f769388f22a6434a705768cedd87386b253b2fd1a5c7436cc63fbb36 SHA512 d0edb8abf6a155dfc7e0a9aa93dcf5817dd624ceaba9b090cef1f5df6486d2187022fc35b6903fa8ac88762d2ad9742a783bb42fb7d3d87b21d8f94af375e2d3
 DIST kubernetes-1.25.0.tar.gz 40040646 BLAKE2B 089d71c9c848d5bdb0fb6c2142a569d2e38e7b89761ff58ecd9aa2a560e71fc310d221b327ce8b1c2790e1eddf3af9e12de37aa784e1c9b0207fd549e6539eeb SHA512 19ab9038d465d409b429ce77c2d90ba62b932c2be08a7192b265c061b7a7da2c46bb887f63b66d1f48f05c9052fdf3cddf5842a55ffc65b0eb3c8cd8b17905bc
 EBUILD kube-apiserver-1.22.13.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
-EBUILD kube-apiserver-1.23.10.ebuild 992 BLAKE2B 78848d01aea6d0efb3c42f0af1ef60b6b80e8884fa1c0b3d811ade0dfe3d0552f2adda802eea4478b069323807a96ff915c329a1bd37d60b3d7d87cf63a6ac7a SHA512 13ef47a1f969ac0437f103e04825cbdf5a8951bed255b69199d8270a1f4b42324c2c9c84fdac7466d64f42682ef81fa90256921a58dcfecb5b03257e845498c7
-EBUILD kube-apiserver-1.23.9.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
-EBUILD kube-apiserver-1.24.3.ebuild 993 BLAKE2B a1c1286df644af89f70d7023ab9033a8ce3e5cd565cfaefcbf59870b5acb242b2d153dad13e54bac53d1c48afdc2dba2c04d7f1b576799fa90508c9731fdcf29 SHA512 e79676ef0d19f4004a7431d5c3abc8cd9f69ac1438cbe429c6a8d1f9d8166119a656bf016fd49e6c4380de5dc55214e4f1b4fa53f3b831a657e731afac218084
-EBUILD kube-apiserver-1.24.4.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
+EBUILD kube-apiserver-1.22.14.ebuild 1017 BLAKE2B f891662b03ea5bdcf7b0455c1013bf51ea916b8d100f16bea54a8734eb3bc3ddf86ea9f947c80be3dd997b713fa3e5b0f687d68ebfc807e6b80c562c1be6601c SHA512 1d2087cc96ad81c431dddb04a484ed2d3d5f10281b48d25f466f10474899780c35697a99bdb32c167182dcec2a5820ff8ead4138cb318aae967a25c39e701e5a
+EBUILD kube-apiserver-1.23.10.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
+EBUILD kube-apiserver-1.23.11.ebuild 992 BLAKE2B 78848d01aea6d0efb3c42f0af1ef60b6b80e8884fa1c0b3d811ade0dfe3d0552f2adda802eea4478b069323807a96ff915c329a1bd37d60b3d7d87cf63a6ac7a SHA512 13ef47a1f969ac0437f103e04825cbdf5a8951bed255b69199d8270a1f4b42324c2c9c84fdac7466d64f42682ef81fa90256921a58dcfecb5b03257e845498c7
+EBUILD kube-apiserver-1.24.4.ebuild 993 BLAKE2B a1c1286df644af89f70d7023ab9033a8ce3e5cd565cfaefcbf59870b5acb242b2d153dad13e54bac53d1c48afdc2dba2c04d7f1b576799fa90508c9731fdcf29 SHA512 e79676ef0d19f4004a7431d5c3abc8cd9f69ac1438cbe429c6a8d1f9d8166119a656bf016fd49e6c4380de5dc55214e4f1b4fa53f3b831a657e731afac218084
+EBUILD kube-apiserver-1.24.5.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
 EBUILD kube-apiserver-1.25.0.ebuild 992 BLAKE2B e5ac9d9cc83970a756fdde6798b016b70ddeb688d20fb40335767858faa69e258b25bf738966ca9d5a2440f5a45c94e0597eb6ec69724c97873175aa2746375f SHA512 80d5e6989c1064138206d6237fc6801e786b374733c77fd8c0470b286e66a217167aa4401496e362a8465517c026effbf29a3c013c660460a1a16de9b15eae9d
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.22.14.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.14.ebuild
new file mode 100644
index 000000000000..19b4da1a49f7
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.22.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.10.ebuild
index a7400f70bdbe..5fb6d6b47274 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.23.10.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.23.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.11.ebuild
index 5fb6d6b47274..a7400f70bdbe 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.23.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.4.ebuild
index 4010c16c51d5..6c3647f71003 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.4.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.24.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.5.ebuild
index 6c3647f71003..4010c16c51d5 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.24.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 68a41cbf547e..871b2f503f30 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,15 +2,17 @@ AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2c
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.22.13.tar.gz 36093191 BLAKE2B ca73ff8e3ce8f22041a38c7e0c52eaec171bae117dd4afde9e9ba952edb5b641d8b0dd472be6ac4aba8859595557e222b188c763bc7cdafd25ab35e4a0ccaa57 SHA512 29bda4adf6970ab2f18fb71a8b932360c27a6b6cb1d0d797ce99a0e8d8469548ac6f54e666a8c8717e5ac44344a9cd34c8dba1c1eeee2074cff88637f60fdf69
+DIST kubernetes-1.22.14.tar.gz 36106528 BLAKE2B 62c07e6d775827ad167db3abfc877cb04a19dd4fef655be69aa815975310b7c7df3c46cafe098b92bc5b01cff3af6ac9e55e05c3a831827185121e6303f40287 SHA512 96c5db11c07224a1cd2a86da21e38e95198a2584eb0657bea920a41ed16c369462e5aff130069230415c49787e99d4582a32dcbf4c79fb79cfc3ce7be37f0d52
 DIST kubernetes-1.23.10.tar.gz 38229682 BLAKE2B 706ea466b4148475321e20b47d2d7f45c5f8fbb50065374604000a72b35eb7732272dea64b521a8b4fb91cd0f05cf28391ca205693dd76bb6a79081a83d65894 SHA512 9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872
-DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
+DIST kubernetes-1.23.11.tar.gz 38238863 BLAKE2B 6c0a4cd85151f32f1755758fe82b1f734216632d677ddcb396126e71002151750bd84993120852c5de68e67915675fdb7b4168426a7d42f7ab774cdab96b5dd9 SHA512 160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2
 DIST kubernetes-1.24.4.tar.gz 37973948 BLAKE2B ee608211efd23507f3e98e00694bb7d90fcfcdf8c66847c0e437860f55ef4d9c8d20463e9d603b1c740d1ec5a6008dcd76bc129635d2765a16c4a69f75644ae8 SHA512 2478e4a114a0efaab530e9f61a61a3b94c9d586ab776519110578a0e127796b737149c5ff0896280f84dd08c972333623fb6aeac5e9bf7f7ebf86f1ee1ba5a05
+DIST kubernetes-1.24.5.tar.gz 37984125 BLAKE2B 2b474f002336a505a0f366173a33cfe6d316a262c527b53aa449180eacfa52a5e71d8067f769388f22a6434a705768cedd87386b253b2fd1a5c7436cc63fbb36 SHA512 d0edb8abf6a155dfc7e0a9aa93dcf5817dd624ceaba9b090cef1f5df6486d2187022fc35b6903fa8ac88762d2ad9742a783bb42fb7d3d87b21d8f94af375e2d3
 DIST kubernetes-1.25.0.tar.gz 40040646 BLAKE2B 089d71c9c848d5bdb0fb6c2142a569d2e38e7b89761ff58ecd9aa2a560e71fc310d221b327ce8b1c2790e1eddf3af9e12de37aa784e1c9b0207fd549e6539eeb SHA512 19ab9038d465d409b429ce77c2d90ba62b932c2be08a7192b265c061b7a7da2c46bb887f63b66d1f48f05c9052fdf3cddf5842a55ffc65b0eb3c8cd8b17905bc
 EBUILD kube-controller-manager-1.22.13.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
-EBUILD kube-controller-manager-1.23.10.ebuild 989 BLAKE2B 6502e890aa70159eed88ed4d79d0ae176355ce33fea5e47fa87986769586abc5fc9d1a220b1b79116e25bc8f66bf1ae0765f18b731159c94ea7692913591127a SHA512 207f261358a494ce4d6a7b8d1805157fab087b6eadbd04122fbd40482112276e22e180314740e520707c176d5c2c1aaa57e8752a447ef5b35115d2da28941d17
-EBUILD kube-controller-manager-1.23.9.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
-EBUILD kube-controller-manager-1.24.3.ebuild 990 BLAKE2B b2e9ba94485dabf41608df895ea0e37bd2c128768cd4102b8a68a5dcd0d73fa0f1c3d3b9341fcdb340e33587475941f707f45a35b7fa85600765e0361cad287e SHA512 eae86891024b243e3d74f83df46edbeb205a03c696563d5b86269c75dd6fa1cfbc245c377719c7167619822a3dc06fdb7f5ae60b8bb33620c65f993c215d362b
-EBUILD kube-controller-manager-1.24.4.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
+EBUILD kube-controller-manager-1.22.14.ebuild 1014 BLAKE2B 97c377f2df93c70ff500772c031802d7d5cebbe23a38000829179f6dd35f4352b694a85c2f72d4e752862fe797a6cba8e2c143a7426c235a1a536297d30a6dae SHA512 ef4f30da99afb95c3574abf48c43ffeea20285a8ac9a48556156992df047e8e3480f9a9a9ce1503d720677db42ab754120abfdc43dd2fa01acbfba74c0ce8b11
+EBUILD kube-controller-manager-1.23.10.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
+EBUILD kube-controller-manager-1.23.11.ebuild 989 BLAKE2B 6502e890aa70159eed88ed4d79d0ae176355ce33fea5e47fa87986769586abc5fc9d1a220b1b79116e25bc8f66bf1ae0765f18b731159c94ea7692913591127a SHA512 207f261358a494ce4d6a7b8d1805157fab087b6eadbd04122fbd40482112276e22e180314740e520707c176d5c2c1aaa57e8752a447ef5b35115d2da28941d17
+EBUILD kube-controller-manager-1.24.4.ebuild 990 BLAKE2B b2e9ba94485dabf41608df895ea0e37bd2c128768cd4102b8a68a5dcd0d73fa0f1c3d3b9341fcdb340e33587475941f707f45a35b7fa85600765e0361cad287e SHA512 eae86891024b243e3d74f83df46edbeb205a03c696563d5b86269c75dd6fa1cfbc245c377719c7167619822a3dc06fdb7f5ae60b8bb33620c65f993c215d362b
+EBUILD kube-controller-manager-1.24.5.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
 EBUILD kube-controller-manager-1.25.0.ebuild 989 BLAKE2B 13c39213214a617ee01d09e7c58316b74260d91396672b23fdbcb914670401a6dc8fd6b3a5bf40ffcfa02bee99858e6140fa84dfecb1b09b2972abcb6a362118 SHA512 24f26360df809ebd0c0dedddaf73e9a80b088c4379651595a5619a4eb0ffac53757b65710aea226eb269d84bdfeffb3b8017f714a81d9607632676be2656ae6c
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.14.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.14.ebuild
new file mode 100644
index 000000000000..3611bae7ae46
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.10.ebuild
index 8a6411803c93..6b3568782a04 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.10.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.11.ebuild
index 6b3568782a04..8a6411803c93 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.4.ebuild
index 492d28a5d90e..7cb5f5ddc809 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.4.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.5.ebuild
index 7cb5f5ddc809..492d28a5d90e 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index e877761358cb..b2cc56b0fd7a 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,15 +2,17 @@ AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.22.13.tar.gz 36093191 BLAKE2B ca73ff8e3ce8f22041a38c7e0c52eaec171bae117dd4afde9e9ba952edb5b641d8b0dd472be6ac4aba8859595557e222b188c763bc7cdafd25ab35e4a0ccaa57 SHA512 29bda4adf6970ab2f18fb71a8b932360c27a6b6cb1d0d797ce99a0e8d8469548ac6f54e666a8c8717e5ac44344a9cd34c8dba1c1eeee2074cff88637f60fdf69
+DIST kubernetes-1.22.14.tar.gz 36106528 BLAKE2B 62c07e6d775827ad167db3abfc877cb04a19dd4fef655be69aa815975310b7c7df3c46cafe098b92bc5b01cff3af6ac9e55e05c3a831827185121e6303f40287 SHA512 96c5db11c07224a1cd2a86da21e38e95198a2584eb0657bea920a41ed16c369462e5aff130069230415c49787e99d4582a32dcbf4c79fb79cfc3ce7be37f0d52
 DIST kubernetes-1.23.10.tar.gz 38229682 BLAKE2B 706ea466b4148475321e20b47d2d7f45c5f8fbb50065374604000a72b35eb7732272dea64b521a8b4fb91cd0f05cf28391ca205693dd76bb6a79081a83d65894 SHA512 9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872
-DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
+DIST kubernetes-1.23.11.tar.gz 38238863 BLAKE2B 6c0a4cd85151f32f1755758fe82b1f734216632d677ddcb396126e71002151750bd84993120852c5de68e67915675fdb7b4168426a7d42f7ab774cdab96b5dd9 SHA512 160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2
 DIST kubernetes-1.24.4.tar.gz 37973948 BLAKE2B ee608211efd23507f3e98e00694bb7d90fcfcdf8c66847c0e437860f55ef4d9c8d20463e9d603b1c740d1ec5a6008dcd76bc129635d2765a16c4a69f75644ae8 SHA512 2478e4a114a0efaab530e9f61a61a3b94c9d586ab776519110578a0e127796b737149c5ff0896280f84dd08c972333623fb6aeac5e9bf7f7ebf86f1ee1ba5a05
+DIST kubernetes-1.24.5.tar.gz 37984125 BLAKE2B 2b474f002336a505a0f366173a33cfe6d316a262c527b53aa449180eacfa52a5e71d8067f769388f22a6434a705768cedd87386b253b2fd1a5c7436cc63fbb36 SHA512 d0edb8abf6a155dfc7e0a9aa93dcf5817dd624ceaba9b090cef1f5df6486d2187022fc35b6903fa8ac88762d2ad9742a783bb42fb7d3d87b21d8f94af375e2d3
 DIST kubernetes-1.25.0.tar.gz 40040646 BLAKE2B 089d71c9c848d5bdb0fb6c2142a569d2e38e7b89761ff58ecd9aa2a560e71fc310d221b327ce8b1c2790e1eddf3af9e12de37aa784e1c9b0207fd549e6539eeb SHA512 19ab9038d465d409b429ce77c2d90ba62b932c2be08a7192b265c061b7a7da2c46bb887f63b66d1f48f05c9052fdf3cddf5842a55ffc65b0eb3c8cd8b17905bc
 EBUILD kube-proxy-1.22.13.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
-EBUILD kube-proxy-1.23.10.ebuild 904 BLAKE2B 3630914e093e3f07eaaaa9e7d9a2bb7706810d3fc9b13843d9caf7dae3baa29fe25b2d1b0fa97545cf074cc56bf59bcfdc2595926fd1785cb93efaa2f4743234 SHA512 1a1a893b9f33407cceecd7e5e06fc9f1baf6e76a2831029b3d7d6743b1090b6c73ab96061e74d54f0f4fd5771b65f6891c58f67ff737ffd52f349edb5ef5f155
-EBUILD kube-proxy-1.23.9.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
-EBUILD kube-proxy-1.24.3.ebuild 905 BLAKE2B 38437dace1ad859f1d0071440672f140b57a025e51b0f6cd48c7bf3f8541a2c310927b212462f0ed3f4987d55c6b734ec272905b044909d6f50fa0ccd0552a49 SHA512 d7fd98864877ebe1e4362801c0a0d14799396241d65a0db7d4189023ed4d41d61b7f1b044761aa8a4e28a51096d76eb48fc06eb4abb4a6c8985a46b633280016
-EBUILD kube-proxy-1.24.4.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
+EBUILD kube-proxy-1.22.14.ebuild 929 BLAKE2B e7cf539cc2ae4e8f47ad785b6c720f66ae3e1dee7fce5f93f104566ebff9ee012f3b6d0623ea56261ff2f923bebdf6f71cc14c68406c9643d5875fd305d3e4b5 SHA512 49859b7ddd88894471d9e58b98455af9f93469a03eb4c40a1e73f113deb684706d69eeb79e06316ee9968af584b558e2cf7a6b908831b71b341492b11889b7d3
+EBUILD kube-proxy-1.23.10.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
+EBUILD kube-proxy-1.23.11.ebuild 904 BLAKE2B 3630914e093e3f07eaaaa9e7d9a2bb7706810d3fc9b13843d9caf7dae3baa29fe25b2d1b0fa97545cf074cc56bf59bcfdc2595926fd1785cb93efaa2f4743234 SHA512 1a1a893b9f33407cceecd7e5e06fc9f1baf6e76a2831029b3d7d6743b1090b6c73ab96061e74d54f0f4fd5771b65f6891c58f67ff737ffd52f349edb5ef5f155
+EBUILD kube-proxy-1.24.4.ebuild 905 BLAKE2B 38437dace1ad859f1d0071440672f140b57a025e51b0f6cd48c7bf3f8541a2c310927b212462f0ed3f4987d55c6b734ec272905b044909d6f50fa0ccd0552a49 SHA512 d7fd98864877ebe1e4362801c0a0d14799396241d65a0db7d4189023ed4d41d61b7f1b044761aa8a4e28a51096d76eb48fc06eb4abb4a6c8985a46b633280016
+EBUILD kube-proxy-1.24.5.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
 EBUILD kube-proxy-1.25.0.ebuild 904 BLAKE2B d23fc99f211e4394787524eb23ccd4f67d030ec961de97bcb3e832fdc1793ad8f59096177628fd3369c170ad18c32c413bc9b7b17e53d81c7e13ec014acc3e15 SHA512 13b52ace2fe08d00c43571708bcb5341f1c6aa00417577001e6706d0d02a239545a1138be8b1819872b8ed7fcba7f2c2231b9e7e73dbef8eeec5e0ab4d8496ea
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.22.14.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.14.ebuild
new file mode 100644
index 000000000000..866b8b777f1f
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.22.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.10.ebuild
index 2193eb857e81..d0b34277f839 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.23.10.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.23.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.11.ebuild
index d0b34277f839..2193eb857e81 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.23.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.4.ebuild
index 9073ae83aebc..c71a00eedf48 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.4.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.24.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.5.ebuild
index c71a00eedf48..9073ae83aebc 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.24.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 142adebb36c1..69e416423e63 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,15 +2,17 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.22.13.tar.gz 36093191 BLAKE2B ca73ff8e3ce8f22041a38c7e0c52eaec171bae117dd4afde9e9ba952edb5b641d8b0dd472be6ac4aba8859595557e222b188c763bc7cdafd25ab35e4a0ccaa57 SHA512 29bda4adf6970ab2f18fb71a8b932360c27a6b6cb1d0d797ce99a0e8d8469548ac6f54e666a8c8717e5ac44344a9cd34c8dba1c1eeee2074cff88637f60fdf69
+DIST kubernetes-1.22.14.tar.gz 36106528 BLAKE2B 62c07e6d775827ad167db3abfc877cb04a19dd4fef655be69aa815975310b7c7df3c46cafe098b92bc5b01cff3af6ac9e55e05c3a831827185121e6303f40287 SHA512 96c5db11c07224a1cd2a86da21e38e95198a2584eb0657bea920a41ed16c369462e5aff130069230415c49787e99d4582a32dcbf4c79fb79cfc3ce7be37f0d52
 DIST kubernetes-1.23.10.tar.gz 38229682 BLAKE2B 706ea466b4148475321e20b47d2d7f45c5f8fbb50065374604000a72b35eb7732272dea64b521a8b4fb91cd0f05cf28391ca205693dd76bb6a79081a83d65894 SHA512 9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872
-DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
+DIST kubernetes-1.23.11.tar.gz 38238863 BLAKE2B 6c0a4cd85151f32f1755758fe82b1f734216632d677ddcb396126e71002151750bd84993120852c5de68e67915675fdb7b4168426a7d42f7ab774cdab96b5dd9 SHA512 160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2
 DIST kubernetes-1.24.4.tar.gz 37973948 BLAKE2B ee608211efd23507f3e98e00694bb7d90fcfcdf8c66847c0e437860f55ef4d9c8d20463e9d603b1c740d1ec5a6008dcd76bc129635d2765a16c4a69f75644ae8 SHA512 2478e4a114a0efaab530e9f61a61a3b94c9d586ab776519110578a0e127796b737149c5ff0896280f84dd08c972333623fb6aeac5e9bf7f7ebf86f1ee1ba5a05
+DIST kubernetes-1.24.5.tar.gz 37984125 BLAKE2B 2b474f002336a505a0f366173a33cfe6d316a262c527b53aa449180eacfa52a5e71d8067f769388f22a6434a705768cedd87386b253b2fd1a5c7436cc63fbb36 SHA512 d0edb8abf6a155dfc7e0a9aa93dcf5817dd624ceaba9b090cef1f5df6486d2187022fc35b6903fa8ac88762d2ad9742a783bb42fb7d3d87b21d8f94af375e2d3
 DIST kubernetes-1.25.0.tar.gz 40040646 BLAKE2B 089d71c9c848d5bdb0fb6c2142a569d2e38e7b89761ff58ecd9aa2a560e71fc310d221b327ce8b1c2790e1eddf3af9e12de37aa784e1c9b0207fd549e6539eeb SHA512 19ab9038d465d409b429ce77c2d90ba62b932c2be08a7192b265c061b7a7da2c46bb887f63b66d1f48f05c9052fdf3cddf5842a55ffc65b0eb3c8cd8b17905bc
 EBUILD kube-scheduler-1.22.13.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
-EBUILD kube-scheduler-1.23.10.ebuild 962 BLAKE2B ebc2aeda907841925e5c217a07407dddac04b82f46271387b1403486b870d95d42d40c4107da9741a7325efa812efecf4cbe771697071ad3e6639f5136631d9a SHA512 0b9cef2e337d0c0af9bd3b2f2e4131d434423724f27fed7992df106bde8e7c788cc5a207b0ef97c7e6ae9d5c50e0fe54c06876a1b24d89e184beb90feca17fbe
-EBUILD kube-scheduler-1.23.9.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
-EBUILD kube-scheduler-1.24.3.ebuild 963 BLAKE2B 81cb462597c2f4ead1eaf7eb5685ff200fbc6e7084ff171f3b471aeb41446de2a1566712aac755b482838007f929cad652bf1a715ff7639c3197d35cfa5d1c57 SHA512 8c882cab899db965a73ee86d0e5605adffe2dea197fe11e54705c93ded70cdaff0afaf393d845bc39dcdfb948bc08d000e86970fd083a539ba2122098ab6e228
-EBUILD kube-scheduler-1.24.4.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
+EBUILD kube-scheduler-1.22.14.ebuild 987 BLAKE2B 152ac5b31334c12ca7a7cdcdae627ea8d00b8e1f118044b33bc59a430d64c9ed46d8231a2d6afcbae9ebf190730533cd405f1bda5661230689a4d1cbb264993f SHA512 ff649c406b4d0da1223c0b0e3611a1fc6570cf78901cd766352b3db0f430eea7a1471de6315b4ba1eabaa515deb4600800ad27ca04997706da4097c57d574e9b
+EBUILD kube-scheduler-1.23.10.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
+EBUILD kube-scheduler-1.23.11.ebuild 962 BLAKE2B ebc2aeda907841925e5c217a07407dddac04b82f46271387b1403486b870d95d42d40c4107da9741a7325efa812efecf4cbe771697071ad3e6639f5136631d9a SHA512 0b9cef2e337d0c0af9bd3b2f2e4131d434423724f27fed7992df106bde8e7c788cc5a207b0ef97c7e6ae9d5c50e0fe54c06876a1b24d89e184beb90feca17fbe
+EBUILD kube-scheduler-1.24.4.ebuild 963 BLAKE2B 81cb462597c2f4ead1eaf7eb5685ff200fbc6e7084ff171f3b471aeb41446de2a1566712aac755b482838007f929cad652bf1a715ff7639c3197d35cfa5d1c57 SHA512 8c882cab899db965a73ee86d0e5605adffe2dea197fe11e54705c93ded70cdaff0afaf393d845bc39dcdfb948bc08d000e86970fd083a539ba2122098ab6e228
+EBUILD kube-scheduler-1.24.5.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
 EBUILD kube-scheduler-1.25.0.ebuild 962 BLAKE2B 239d3af99ec8c10da304cc1b9188cf9c9c54a187581642c33df029007d3a4b52e9bdfa4a60077c43ee0139a986fbe109ad832b38041a0312964cbafe48ed0a0a SHA512 b7ac6578cadc08491871731e49e8f36e4183bda9dc594b0b3e365ca61750d13f7a0921de4c81a944f3909f9cd9591ae9d3c2cd2e9444da2d54b6a17e5f278e0f
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.22.14.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.14.ebuild
new file mode 100644
index 000000000000..6deafd6db8c6
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.22.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.10.ebuild
index 393cef8175ab..446310121794 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.23.10.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.23.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.11.ebuild
index 446310121794..393cef8175ab 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.23.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.4.ebuild
index 0644cbea3c98..825dcd92ae76 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.4.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.24.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.5.ebuild
index 825dcd92ae76..0644cbea3c98 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.24.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index c5cba54a7a93..bd4549d362f3 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,13 +1,15 @@
 DIST kubernetes-1.22.13.tar.gz 36093191 BLAKE2B ca73ff8e3ce8f22041a38c7e0c52eaec171bae117dd4afde9e9ba952edb5b641d8b0dd472be6ac4aba8859595557e222b188c763bc7cdafd25ab35e4a0ccaa57 SHA512 29bda4adf6970ab2f18fb71a8b932360c27a6b6cb1d0d797ce99a0e8d8469548ac6f54e666a8c8717e5ac44344a9cd34c8dba1c1eeee2074cff88637f60fdf69
+DIST kubernetes-1.22.14.tar.gz 36106528 BLAKE2B 62c07e6d775827ad167db3abfc877cb04a19dd4fef655be69aa815975310b7c7df3c46cafe098b92bc5b01cff3af6ac9e55e05c3a831827185121e6303f40287 SHA512 96c5db11c07224a1cd2a86da21e38e95198a2584eb0657bea920a41ed16c369462e5aff130069230415c49787e99d4582a32dcbf4c79fb79cfc3ce7be37f0d52
 DIST kubernetes-1.23.10.tar.gz 38229682 BLAKE2B 706ea466b4148475321e20b47d2d7f45c5f8fbb50065374604000a72b35eb7732272dea64b521a8b4fb91cd0f05cf28391ca205693dd76bb6a79081a83d65894 SHA512 9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872
-DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
+DIST kubernetes-1.23.11.tar.gz 38238863 BLAKE2B 6c0a4cd85151f32f1755758fe82b1f734216632d677ddcb396126e71002151750bd84993120852c5de68e67915675fdb7b4168426a7d42f7ab774cdab96b5dd9 SHA512 160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2
 DIST kubernetes-1.24.4.tar.gz 37973948 BLAKE2B ee608211efd23507f3e98e00694bb7d90fcfcdf8c66847c0e437860f55ef4d9c8d20463e9d603b1c740d1ec5a6008dcd76bc129635d2765a16c4a69f75644ae8 SHA512 2478e4a114a0efaab530e9f61a61a3b94c9d586ab776519110578a0e127796b737149c5ff0896280f84dd08c972333623fb6aeac5e9bf7f7ebf86f1ee1ba5a05
+DIST kubernetes-1.24.5.tar.gz 37984125 BLAKE2B 2b474f002336a505a0f366173a33cfe6d316a262c527b53aa449180eacfa52a5e71d8067f769388f22a6434a705768cedd87386b253b2fd1a5c7436cc63fbb36 SHA512 d0edb8abf6a155dfc7e0a9aa93dcf5817dd624ceaba9b090cef1f5df6486d2187022fc35b6903fa8ac88762d2ad9742a783bb42fb7d3d87b21d8f94af375e2d3
 DIST kubernetes-1.25.0.tar.gz 40040646 BLAKE2B 089d71c9c848d5bdb0fb6c2142a569d2e38e7b89761ff58ecd9aa2a560e71fc310d221b327ce8b1c2790e1eddf3af9e12de37aa784e1c9b0207fd549e6539eeb SHA512 19ab9038d465d409b429ce77c2d90ba62b932c2be08a7192b265c061b7a7da2c46bb887f63b66d1f48f05c9052fdf3cddf5842a55ffc65b0eb3c8cd8b17905bc
 EBUILD kubeadm-1.22.13.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
-EBUILD kubeadm-1.23.10.ebuild 878 BLAKE2B 2278f6ff3cd15b03d5fafd5d5e03e6a565666171533c849750fbabee73e9300e29a4b3b80d213e0ca05ed43854f3b3444579d4da6081c40f09aa7633cb3d97f7 SHA512 b9c84df0bac044457c6cc1db5e745955349b2e035ae49ec91ea7f2f478eb2d40e0d904238ca0f2a4307eea0c2e59410c26935b7f52c72a5f45a819983493e0ad
-EBUILD kubeadm-1.23.9.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
-EBUILD kubeadm-1.24.3.ebuild 879 BLAKE2B bbf1734ee70deee6e3f279da38e83f60e616dc02b432c60c272149617c346fcb352ae01c36b22fc8b394a57a1367590b97540bf3f94beebcd2acc53112bf52af SHA512 cae05e44f0cd285b606afd1231337c3a9b9f8659ed9aaa3b8e4121b6db9913ed90baf9e5cc3dc09d884bc7f031e1552ebb7df9c7fc4e936ab9278b3fc5b5e556
-EBUILD kubeadm-1.24.4.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
+EBUILD kubeadm-1.22.14.ebuild 912 BLAKE2B 7548d6905fd17d946d2d4e974229257aac34a826728c50d113ebff6a5d9758fe2f92c1388b6ed344056435f1af1563311f0c3e185d0aef4318cb1ba3167276c1 SHA512 094215e91d4681b9be05d3c67426e99f3a7bd6e7ffb34ee5c7a3fac96907c06f34dcb492d09dbaec7a045b2c13a66aef699ed0308fdf12dc6d1196a7bf7b01d0
+EBUILD kubeadm-1.23.10.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
+EBUILD kubeadm-1.23.11.ebuild 878 BLAKE2B 2278f6ff3cd15b03d5fafd5d5e03e6a565666171533c849750fbabee73e9300e29a4b3b80d213e0ca05ed43854f3b3444579d4da6081c40f09aa7633cb3d97f7 SHA512 b9c84df0bac044457c6cc1db5e745955349b2e035ae49ec91ea7f2f478eb2d40e0d904238ca0f2a4307eea0c2e59410c26935b7f52c72a5f45a819983493e0ad
+EBUILD kubeadm-1.24.4.ebuild 879 BLAKE2B bbf1734ee70deee6e3f279da38e83f60e616dc02b432c60c272149617c346fcb352ae01c36b22fc8b394a57a1367590b97540bf3f94beebcd2acc53112bf52af SHA512 cae05e44f0cd285b606afd1231337c3a9b9f8659ed9aaa3b8e4121b6db9913ed90baf9e5cc3dc09d884bc7f031e1552ebb7df9c7fc4e936ab9278b3fc5b5e556
+EBUILD kubeadm-1.24.5.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
 EBUILD kubeadm-1.25.0.ebuild 878 BLAKE2B 99ce3297e0fd2cb87ca856908d0f29c500ee79733c7db19d9119b907948bf013368d32ff1cd2c6cabc7de0c7ac6e929cedcaf50ded1014f5fecfd9fef273ef5b SHA512 8a99dd45624c19178defdf2b9fd181ad9dcf785938b6330b1a0739e1f95b365901a9eee26b645f999d2512c07d5a66f68fc5d83bc87ccc8c1b64b3a64625fbf5
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.22.14.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.14.ebuild
new file mode 100644
index 000000000000..654b067fe403
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.22.14.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 to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.10.ebuild
index bcdb2bea7e7d..0789de0b701a 100644
--- a/sys-cluster/kubeadm/kubeadm-1.23.10.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.23.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.11.ebuild
index 0789de0b701a..bcdb2bea7e7d 100644
--- a/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.23.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.4.ebuild
index 0bc4d23fc42c..b616b259fd08 100644
--- a/sys-cluster/kubeadm/kubeadm-1.24.4.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.24.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.5.ebuild
index b616b259fd08..0bc4d23fc42c 100644
--- a/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.24.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index ae9f84d6fce8..467b7db47532 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,13 +1,15 @@
 DIST kubernetes-1.22.13.tar.gz 36093191 BLAKE2B ca73ff8e3ce8f22041a38c7e0c52eaec171bae117dd4afde9e9ba952edb5b641d8b0dd472be6ac4aba8859595557e222b188c763bc7cdafd25ab35e4a0ccaa57 SHA512 29bda4adf6970ab2f18fb71a8b932360c27a6b6cb1d0d797ce99a0e8d8469548ac6f54e666a8c8717e5ac44344a9cd34c8dba1c1eeee2074cff88637f60fdf69
+DIST kubernetes-1.22.14.tar.gz 36106528 BLAKE2B 62c07e6d775827ad167db3abfc877cb04a19dd4fef655be69aa815975310b7c7df3c46cafe098b92bc5b01cff3af6ac9e55e05c3a831827185121e6303f40287 SHA512 96c5db11c07224a1cd2a86da21e38e95198a2584eb0657bea920a41ed16c369462e5aff130069230415c49787e99d4582a32dcbf4c79fb79cfc3ce7be37f0d52
 DIST kubernetes-1.23.10.tar.gz 38229682 BLAKE2B 706ea466b4148475321e20b47d2d7f45c5f8fbb50065374604000a72b35eb7732272dea64b521a8b4fb91cd0f05cf28391ca205693dd76bb6a79081a83d65894 SHA512 9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872
-DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
+DIST kubernetes-1.23.11.tar.gz 38238863 BLAKE2B 6c0a4cd85151f32f1755758fe82b1f734216632d677ddcb396126e71002151750bd84993120852c5de68e67915675fdb7b4168426a7d42f7ab774cdab96b5dd9 SHA512 160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2
 DIST kubernetes-1.24.4.tar.gz 37973948 BLAKE2B ee608211efd23507f3e98e00694bb7d90fcfcdf8c66847c0e437860f55ef4d9c8d20463e9d603b1c740d1ec5a6008dcd76bc129635d2765a16c4a69f75644ae8 SHA512 2478e4a114a0efaab530e9f61a61a3b94c9d586ab776519110578a0e127796b737149c5ff0896280f84dd08c972333623fb6aeac5e9bf7f7ebf86f1ee1ba5a05
+DIST kubernetes-1.24.5.tar.gz 37984125 BLAKE2B 2b474f002336a505a0f366173a33cfe6d316a262c527b53aa449180eacfa52a5e71d8067f769388f22a6434a705768cedd87386b253b2fd1a5c7436cc63fbb36 SHA512 d0edb8abf6a155dfc7e0a9aa93dcf5817dd624ceaba9b090cef1f5df6486d2187022fc35b6903fa8ac88762d2ad9742a783bb42fb7d3d87b21d8f94af375e2d3
 DIST kubernetes-1.25.0.tar.gz 40040646 BLAKE2B 089d71c9c848d5bdb0fb6c2142a569d2e38e7b89761ff58ecd9aa2a560e71fc310d221b327ce8b1c2790e1eddf3af9e12de37aa784e1c9b0207fd549e6539eeb SHA512 19ab9038d465d409b429ce77c2d90ba62b932c2be08a7192b265c061b7a7da2c46bb887f63b66d1f48f05c9052fdf3cddf5842a55ffc65b0eb3c8cd8b17905bc
 EBUILD kubectl-1.22.13.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
-EBUILD kubectl-1.23.10.ebuild 874 BLAKE2B f8edcff235a13dab9ff396b87d207ef4d829ac54213b312621f4f3d9da9e76828af7bbf2ba312ebc8255764568591775501478cdba4533cb6c3f3bbcd6ef47bd SHA512 21c7c81aa7ec98429c6cf6d993ee7ed90380e0f8a32799c66dc80e40d9a3a7b4d7a3612edb1673ce99f1fea6e9f04e0b9bbcffccb73f78f72f261127556cac9e
-EBUILD kubectl-1.23.9.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
-EBUILD kubectl-1.24.3.ebuild 875 BLAKE2B fdf10d1e8ae1aea685425639eebbef4576f17afe6e55a4f26e51f7d6d058987e606097a3cb1d704826f7fd258cd6f4491340867b8f39bcafdfebc762dad4a8cd SHA512 b18e3add6afa37d1b5b8b248d67cce2af2f17faa78f649d670582a252d64cba44a2cd67f7ebe1968f4d108698518fffd478c8c2cce1859a747a35ea39e538340
-EBUILD kubectl-1.24.4.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
+EBUILD kubectl-1.22.14.ebuild 907 BLAKE2B 999827e20b71b48c7bd7b18a4a42e7c9fd3e518330e5a47341f3b0801989c2febc2118500fc4441c9cb4e7ba82bee6981b9a3c57e653e6ca83d13b459f5590d3 SHA512 3a37997bcbb018485e0d09c0236f95242092a0dfad1717d72cdc4a9ad65ee7290b31faf0d6e6b837476bc6f3c0cc73ce193e20ec2f3fdb2c112b35857a2b760e
+EBUILD kubectl-1.23.10.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
+EBUILD kubectl-1.23.11.ebuild 874 BLAKE2B f8edcff235a13dab9ff396b87d207ef4d829ac54213b312621f4f3d9da9e76828af7bbf2ba312ebc8255764568591775501478cdba4533cb6c3f3bbcd6ef47bd SHA512 21c7c81aa7ec98429c6cf6d993ee7ed90380e0f8a32799c66dc80e40d9a3a7b4d7a3612edb1673ce99f1fea6e9f04e0b9bbcffccb73f78f72f261127556cac9e
+EBUILD kubectl-1.24.4.ebuild 875 BLAKE2B fdf10d1e8ae1aea685425639eebbef4576f17afe6e55a4f26e51f7d6d058987e606097a3cb1d704826f7fd258cd6f4491340867b8f39bcafdfebc762dad4a8cd SHA512 b18e3add6afa37d1b5b8b248d67cce2af2f17faa78f649d670582a252d64cba44a2cd67f7ebe1968f4d108698518fffd478c8c2cce1859a747a35ea39e538340
+EBUILD kubectl-1.24.5.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
 EBUILD kubectl-1.25.0.ebuild 874 BLAKE2B ecb6bf66fc745b3675d332b00de2c8c31d3a7e02693110dd8ce225ed5d013f8dcc49b1d765827f4bf79c4841a020b06381386f6c4dc4f096b58dd5ff13d82787 SHA512 c5b2f0389b089a27100862655c2a207568a655490cc35f3733840844b675f0bf0bd8fa7c1f5eba46d27270fc728913c24b9274d5e4ae2f970d2e798c62bd5321
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.22.14.ebuild b/sys-cluster/kubectl/kubectl-1.22.14.ebuild
new file mode 100644
index 000000000000..f480c2f82844
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.22.14.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 to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.23.10.ebuild b/sys-cluster/kubectl/kubectl-1.23.10.ebuild
index 93befd485395..619b0c541831 100644
--- a/sys-cluster/kubectl/kubectl-1.23.10.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.23.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubectl/kubectl-1.23.9.ebuild b/sys-cluster/kubectl/kubectl-1.23.11.ebuild
index 619b0c541831..93befd485395 100644
--- a/sys-cluster/kubectl/kubectl-1.23.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.23.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubectl/kubectl-1.24.4.ebuild b/sys-cluster/kubectl/kubectl-1.24.4.ebuild
index 375df35b0a71..bc629ac72555 100644
--- a/sys-cluster/kubectl/kubectl-1.24.4.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.24.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubectl/kubectl-1.24.3.ebuild b/sys-cluster/kubectl/kubectl-1.24.5.ebuild
index bc629ac72555..375df35b0a71 100644
--- a/sys-cluster/kubectl/kubectl-1.24.3.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.24.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index b675175c2ecb..12cefc5f4010 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -4,15 +4,17 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.22.13.tar.gz 36093191 BLAKE2B ca73ff8e3ce8f22041a38c7e0c52eaec171bae117dd4afde9e9ba952edb5b641d8b0dd472be6ac4aba8859595557e222b188c763bc7cdafd25ab35e4a0ccaa57 SHA512 29bda4adf6970ab2f18fb71a8b932360c27a6b6cb1d0d797ce99a0e8d8469548ac6f54e666a8c8717e5ac44344a9cd34c8dba1c1eeee2074cff88637f60fdf69
+DIST kubernetes-1.22.14.tar.gz 36106528 BLAKE2B 62c07e6d775827ad167db3abfc877cb04a19dd4fef655be69aa815975310b7c7df3c46cafe098b92bc5b01cff3af6ac9e55e05c3a831827185121e6303f40287 SHA512 96c5db11c07224a1cd2a86da21e38e95198a2584eb0657bea920a41ed16c369462e5aff130069230415c49787e99d4582a32dcbf4c79fb79cfc3ce7be37f0d52
 DIST kubernetes-1.23.10.tar.gz 38229682 BLAKE2B 706ea466b4148475321e20b47d2d7f45c5f8fbb50065374604000a72b35eb7732272dea64b521a8b4fb91cd0f05cf28391ca205693dd76bb6a79081a83d65894 SHA512 9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872
-DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
+DIST kubernetes-1.23.11.tar.gz 38238863 BLAKE2B 6c0a4cd85151f32f1755758fe82b1f734216632d677ddcb396126e71002151750bd84993120852c5de68e67915675fdb7b4168426a7d42f7ab774cdab96b5dd9 SHA512 160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2
 DIST kubernetes-1.24.4.tar.gz 37973948 BLAKE2B ee608211efd23507f3e98e00694bb7d90fcfcdf8c66847c0e437860f55ef4d9c8d20463e9d603b1c740d1ec5a6008dcd76bc129635d2765a16c4a69f75644ae8 SHA512 2478e4a114a0efaab530e9f61a61a3b94c9d586ab776519110578a0e127796b737149c5ff0896280f84dd08c972333623fb6aeac5e9bf7f7ebf86f1ee1ba5a05
+DIST kubernetes-1.24.5.tar.gz 37984125 BLAKE2B 2b474f002336a505a0f366173a33cfe6d316a262c527b53aa449180eacfa52a5e71d8067f769388f22a6434a705768cedd87386b253b2fd1a5c7436cc63fbb36 SHA512 d0edb8abf6a155dfc7e0a9aa93dcf5817dd624ceaba9b090cef1f5df6486d2187022fc35b6903fa8ac88762d2ad9742a783bb42fb7d3d87b21d8f94af375e2d3
 DIST kubernetes-1.25.0.tar.gz 40040646 BLAKE2B 089d71c9c848d5bdb0fb6c2142a569d2e38e7b89761ff58ecd9aa2a560e71fc310d221b327ce8b1c2790e1eddf3af9e12de37aa784e1c9b0207fd549e6539eeb SHA512 19ab9038d465d409b429ce77c2d90ba62b932c2be08a7192b265c061b7a7da2c46bb887f63b66d1f48f05c9052fdf3cddf5842a55ffc65b0eb3c8cd8b17905bc
 EBUILD kubelet-1.22.13.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
-EBUILD kubelet-1.23.10.ebuild 970 BLAKE2B fc431b0d0543d2a6d8a0a38aea43443a218437dea52c2e5719e9b21266a648137a27acaf4dacc4ca3ff1e575e62f13b80a0d67c17e80a12135e0685c99ada902 SHA512 b868d712bfa9a549eac6b3836c6d6c6f8fee039fd74b735bb37dbd0dc2d49987ac40b927f93b08425a9b67b710a4bc38a062a1472e5334cd4ad7cc63294d51ac
-EBUILD kubelet-1.23.9.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
-EBUILD kubelet-1.24.3.ebuild 971 BLAKE2B a79899c59bf5c31ed15b98512e5868a7d11da802ec23517e08833c99470a11ee13db4dd119e369183b9713e83ea41fc6d1ecb853cc0d622967329fb94ccbdec9 SHA512 f5f5a0ecc9379a7062d9f275e7704e1887aeb59ecd235eacb6962ae393456b0c1f81a0f5cbf44246360e33e26ee033a7ebce2919b744ce8c927c4a1f7475b1eb
-EBUILD kubelet-1.24.4.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
+EBUILD kubelet-1.22.14.ebuild 1004 BLAKE2B 3df4d1079ca82c4e80a182230735e807b741bcf0cba6ceb9277c4126b62378e49ee6acb40145553b61f773139c0427a0078d516d56752ad6320716418177bf7f SHA512 7719010c913ef05977a61e1e5bad258eb1f891a1c511a39d8d89e15df2a31c2e718c695d2e6864fdd4a1e6513587f025fc2dddae40ef32cf050b8c7370de48b8
+EBUILD kubelet-1.23.10.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
+EBUILD kubelet-1.23.11.ebuild 970 BLAKE2B fc431b0d0543d2a6d8a0a38aea43443a218437dea52c2e5719e9b21266a648137a27acaf4dacc4ca3ff1e575e62f13b80a0d67c17e80a12135e0685c99ada902 SHA512 b868d712bfa9a549eac6b3836c6d6c6f8fee039fd74b735bb37dbd0dc2d49987ac40b927f93b08425a9b67b710a4bc38a062a1472e5334cd4ad7cc63294d51ac
+EBUILD kubelet-1.24.4.ebuild 971 BLAKE2B a79899c59bf5c31ed15b98512e5868a7d11da802ec23517e08833c99470a11ee13db4dd119e369183b9713e83ea41fc6d1ecb853cc0d622967329fb94ccbdec9 SHA512 f5f5a0ecc9379a7062d9f275e7704e1887aeb59ecd235eacb6962ae393456b0c1f81a0f5cbf44246360e33e26ee033a7ebce2919b744ce8c927c4a1f7475b1eb
+EBUILD kubelet-1.24.5.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
 EBUILD kubelet-1.25.0.ebuild 970 BLAKE2B 35b9758d7451812c204129ca8a7292574729c0ee7eb5c64b56c0742171d042fa3c99dbf1e7dd9cc314e1b16bc450ef60fd325d9f067e160c1ed463a21e2b57e0 SHA512 99cfb679ea609afa6e96d2fab51f1e251016152a6e61eda86774753c095ad4b0cfb2a393afcbf9abd1bf9c42d0b4b389c78a255889c19bfc66de0f0b2f33c37f
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.22.14.ebuild b/sys-cluster/kubelet/kubelet-1.22.14.ebuild
new file mode 100644
index 000000000000..3dc412ebab17
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.22.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.23.10.ebuild b/sys-cluster/kubelet/kubelet-1.23.10.ebuild
index ecbeff2f53f1..1460ed4513e3 100644
--- a/sys-cluster/kubelet/kubelet-1.23.10.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.23.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubelet/kubelet-1.23.9.ebuild b/sys-cluster/kubelet/kubelet-1.23.11.ebuild
index 1460ed4513e3..ecbeff2f53f1 100644
--- a/sys-cluster/kubelet/kubelet-1.23.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.23.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubelet/kubelet-1.24.4.ebuild b/sys-cluster/kubelet/kubelet-1.24.4.ebuild
index e4341ebfaa6b..e27cd329b9b4 100644
--- a/sys-cluster/kubelet/kubelet-1.24.4.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.24.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubelet/kubelet-1.24.3.ebuild b/sys-cluster/kubelet/kubelet-1.24.5.ebuild
index e27cd329b9b4..e4341ebfaa6b 100644
--- a/sys-cluster/kubelet/kubelet-1.24.3.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.24.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9fc696477071..38fab2e97d0b 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 7cadab2b7ae0..75cb646a6ac1 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -42,7 +42,7 @@ EBUILD glibc-2.31-r7.ebuild 44526 BLAKE2B d718ec5e28b0a6dcb77bab3813cd3084db5569
 EBUILD glibc-2.32-r8.ebuild 44857 BLAKE2B d41468b9ca278945dc54ccc9b9ba7f61ac2d3d95febea6ed98dc9bf7e31072fb76760af9b0883d2bbbde87f34d39569d77d41e4b3100670caf59e35e081e06b8 SHA512 813b3e7be08562736814eec65241969eb660a9ee905ea7307fd6df5e12d271e73a0ba4a62d20273a06fb1450a7505fd66932a9e8a2863690f02b7b9574a556fc
 EBUILD glibc-2.33-r14.ebuild 48617 BLAKE2B bd3d13ab2419162e08cb204e279b1d570d5e6239bf860188e9ce5c4167efb3637e1292e31df94b1118254157ba2f05017758fbf577575954b75ec9ac53cfeac0 SHA512 b14238e6f88010570c3d4de6d2672bc4ba5c66f5c59a5a03e0ac0a827893f781d1a02c720c80755dd9dcae3958575f74c3a36f676b96371754986e1327e918b9
 EBUILD glibc-2.34-r14.ebuild 49608 BLAKE2B 387023eb99a184e90ae50a09375e9858307f458c4d48b487d50d83bbe571b0b186eeea1ce8a71bc1f243e4220b04eaf7426b75182157655fe44d31bbb60b4e6d SHA512 578c2f6599045b34410dc0905e35263325bb28fd73b6f5c8d487b432e966088b189e24fd16a1055efdf93128c5343db88b1adc514659f878aaefe2426ced56dc
-EBUILD glibc-2.35-r10.ebuild 49629 BLAKE2B 26260d904fb3a3771637260281f1c85930241173340ddab94bd28a1576639c1d7bbea64b93dad136f2f693c7cb29302597c1c97cb4e97772ab8ab560cdb06e5f SHA512 13a7450761ec3d06eb5c97b537cb40a77ed5804d0991d80b3c2ac54c33f981fd00e780b144fc0884ba9d8b0ef26686c9f8a40f1450c97d637c91ebdd01251b1e
+EBUILD glibc-2.35-r10.ebuild 49609 BLAKE2B 3e0dc09b04aa36c2c36266307915ad4ddfd612fc2dc6e8620cd3d38ce492a9c19a322e9eff01f308994207391f817ff52712c67f1e0db7d17316d345380984b2 SHA512 6a4b561f43ff8c92fba8e34b068072dc18fdf1bb403139e1f52ce2cc321d2d66bdd0bcae60b2ba2029deb66dce75bd6d2fed590505ba8502679eb2d76245a467
 EBUILD glibc-2.35-r8.ebuild 49600 BLAKE2B fb94b2cffb0c865d09df914cacb735cc58d05d8bd01d38c6b54f04122b3aa52cb520bd3fa71430d2c994019cf340f33b4c52cb5990dce56a5739e016d86872d2 SHA512 5989fd748a51403724e2fa3ea70c2387840e3661923aa62749d178ff9bb0d23e81f39772800772ec551744f2c7ff3f9277fbd92ea8ce0f1b9fa91c581eb5c4c7
 EBUILD glibc-2.36-r1.ebuild 49799 BLAKE2B 0abb293a6c048224361cf4a738651966bb8b4c761fda1ca13948b6919c4387baf9e53a966acc62baaa2627b93b99843d6d646654f20038b511b3c76c21be5ed1 SHA512 cc668dd9ed791cc71f3efeb99653733297988c5f69833223cb2a6cdaf7e0f78b360f4f4077e5dc5cdad6f5560e837dd5909ee197d64a8766b0e330c177abfd78
 EBUILD glibc-9999.ebuild 49793 BLAKE2B 7e893dc3731e6720dbb75193492ae249a27ddff432f60ab56b39aa95d853ee22280eb34a501e160a70a67ec6b4fa65741883e2a93b27741ae025b4297729aed2 SHA512 c6e8ec4db042b40d111bb96f79fcf3956ab515cbd5c297e74fb2978b8c87948cc58366ad4e57aeb4099522a2960456c3e8811400f5dcf271ae22913bd172c2a1
diff --git a/sys-libs/glibc/glibc-2.35-r10.ebuild b/sys-libs/glibc/glibc-2.35-r10.ebuild
index b82f5d853149..9304559b29e4 100644
--- a/sys-libs/glibc/glibc-2.35-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r10.ebuild
@@ -26,8 +26,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	KEYWORDS="~m68k"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 	SRC_URI+=" experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz )"
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 389ffd4baaea..104257bc75ad 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -4,6 +4,6 @@ DIST liburing-2.1.tar.bz2 120806 BLAKE2B 3a09d1504150ed1c111f064187d868fd86ec7c3
 DIST liburing-2.2.tar.bz2 172733 BLAKE2B 19ae8a356e4fdc296bfb3ff121b777bd7c970388b31686aac5c531508e807360d58220bc27f9c62c55bd76ca687013acfceb3fa8a2162b615561f637cc50ffe1 SHA512 55b935a90c108be54393a5ab341b56e40ad8d506360fe15b3dcde5ee263356f11080f8614efdc4253f6318ea35d808ec47a9dbfc6b9f6cc2e04f7f1a75c3f621
 EBUILD liburing-2.1-r1.ebuild 1525 BLAKE2B 4315bda5edd8f067d44048764d945b3c2bde63de6fb3781681bd757e316997856c36ab465279819917a4d75ca4d962f7d9cfffd1f1b97c068cc30be9a3045053 SHA512 1d6894c92fc242ea393aa3d3b5813eec625742ff75b334d365bdcc6cb78b6c18b5a6c8abc07e7d427135af35b7e2127e687aba4cca65c9c204f76267b407f0fc
 EBUILD liburing-2.1-r2.ebuild 1724 BLAKE2B 900c92124e14b809a698f48b81536e4b6c37e6629169fcb0b668cefb51cdcba84d7555a3eff957b0bd1b9c37bb2f4005d9c2bae569b6a1b852043c77614f3d02 SHA512 385c3f5f1d2d5bc38463d758d317ce58ee57261b80e039772a3a050d4aa870dcd80f4a7d5247e6036aea777494edf40af6669438ea4ef9b1cad87144437789aa
-EBUILD liburing-2.2.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
+EBUILD liburing-2.2.ebuild 1576 BLAKE2B 4178a4bc4104d4c5dc7966ef019e6f51a4c948ecd0dfd39c45407bdc9add459e41a7f9062251b221c48323e905868c2abe5e293316199421d7856fe5fe4965cd SHA512 96fa21dd8f2a2d2d6796b9e5381471838b4c76d5a8728f283701d4ff685ea7f85d1782e9ed6bc033a52bee916899f9ade929a94258330bbd7c1e01f8d68bec9e
 EBUILD liburing-9999.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
 MISC metadata.xml 326 BLAKE2B 7c133a6dbb4ab4b537c0741ec9f3cd525c0803040950ee93e4c1cbc848c7618074471cc1a18ca07d6963c06252c83b66df0811ebae4c0cf9d7782f66ca5aa14a SHA512 1aacf941a9fa57429468fdfc8f546f559c5d483988ba5c6b0f4ed0fe5913f85d218b2a9eec83bae1d11a71eed36a37e76ccedc192697fbe9763fd0b09b2dcfd7
diff --git a/sys-libs/liburing/liburing-2.2.ebuild b/sys-libs/liburing/liburing-2.2.ebuild
index 60a614906d8e..9a7ea92649bf 100644
--- a/sys-libs/liburing/liburing-2.2.ebuild
+++ b/sys-libs/liburing/liburing-2.2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
 else
 	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86"
 fi
 LICENSE="MIT"
 SLOT="0/2" # liburing.so major version
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 9fdccefb6bc3..dc8719f1ca14 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 966e70c14427..d2b130733cfb 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,8 +20,8 @@ DIST chromium-105.0.5195.52.tar.xz 1597749968 BLAKE2B 642a5601157ed4b05aa3446755
 DIST chromium-106-patchset-1.tar.xz 5660 BLAKE2B b1003aa49aed07ac097607e67cb48bab11b8790c6b4c8f241bb8677baff372771b76076195713164ee71c81b8211fc400e52598b63a3cc03ff7a32ef5d1b0226 SHA512 7eb2818a8449cb2c90198e2d7f228adaed4c7c50de1833ebf59ff895512bd033d3a55398349f1ac797661d1d0b3c201b74b54f4b1d4e375e280795a4a20ba5aa
 DIST chromium-106.0.5249.12.tar.xz 1610862824 BLAKE2B 35d0d8af2fc3d71560b0913560a1fa18cd1c72f173d1dc89f0ac76e6ef5e34c11dda6a619d00805158d8e051f4946d2d1b81fe2cf1deffbeb039f8e4aeff9ba7 SHA512 4727331dba888cc6d1f2e8faa85867c132bbf359e6718e8eee12735396e60b6817421f9a3c1baf97b926ea6f2e3cd02322379754416da0c5228fd98b7d6e006c
 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
-EBUILD chromium-104.0.5112.101.ebuild 37236 BLAKE2B 2e8095dd8661d54b90e702dda9431a38f91764fc96c70114e51e8f6dadf5a18859020b7965dcf9e6701834b2edb5308afd556ea7dfa6e74cd1e9b1ddf5c0e70e SHA512 db080f477283a2a6922a8031ad4ef9e7b2f6fd13e05aae28adb3b76c9c3ea82a6b483d2c14f5bb8d1621a468ba43fe932eab570192566067dc272c4d03a8b83d
-EBUILD chromium-105.0.5195.102.ebuild 37015 BLAKE2B 73a97907bc0eeded0553cacc46eea9251dfa618ba1d7629ab69dad95d91246fd4a191d072e580993f3afac0bfee5e708641e5ca3ffa3b70f8fbb64c67ccf2d2b SHA512 753cb9d2617d18e77ae2532ae1c2dd4f8be7eed8a77479c0c90c16f73ddb330786de473dda77d45be5cec13feaa6ba439a03e33021cc25f3324a885beaadd38f
-EBUILD chromium-105.0.5195.52.ebuild 37017 BLAKE2B f354e5b665d9fb1832cf5713fa68313deea91ebe957c4d520c0c0a80ca52401a8cccd9c664d9c02e69eb8c30f6b6acc341897d6ee21d2ca20ffc963e84da17ef SHA512 81f8a1f0d00aa3c213e5338cf94020578f89446c6e1298f4532754fa8bb2a060f2f5366c923c30b7211e95b2b57a0fd114ee243129310a09fb2ab35e953866fe
-EBUILD chromium-106.0.5249.12.ebuild 37050 BLAKE2B 8334aef1adcca269baeed06c4a5ad7e2b39df78e6f4a17ce6ee17f57fa5a21ba4d8f1b2eefb05de2e2dc5481705eb73500cef7d8abba0e4600dd99daa3f93245 SHA512 a9e39055744d4f05c486956f08bae04c6e8206abc46a4576e5fb4a7294bbe69a6a245200fd303d20812f6a23529f7e3c74f87c78b8fd5e98be0f8a5949d8b8cc
+EBUILD chromium-104.0.5112.101.ebuild 37242 BLAKE2B 551796fbfbbbc0f0acf28db17e4b323624311e6baebe82aad7b2991b1ea33dcb337a60420f3cb46c7fa70567aaf42a105e53d6f627875fccf56183585e5eed13 SHA512 17bbec8948be87a1d653168053b2108dca3f70b91b14efc7e220039cb9ed31d168ec5cab7e0048cd311f525d5336266a27574aa24c31560dc2a1989d9b2caab5
+EBUILD chromium-105.0.5195.102.ebuild 37021 BLAKE2B b2ad245eac710bdb1a298e87dcadf858f44873d2766600f2ba7220a063deb12c376c5684467cf16b97875a0d15fede251bcaea3bdc4fe3c2e9ee45018da89288 SHA512 e88cd3add25c58b098146d7643d33f935d0129ba035e36b2aa9cadba42676738243b1ed880d638a18757a0b54e9743766ad7d9ce807be9c3d51c3f31567efdab
+EBUILD chromium-105.0.5195.52.ebuild 37023 BLAKE2B cf4cd986d70a42829b21589dee699fa947f188abf6df66f9f51e3701181f91b1812f56c18317e673e9918c29387b719e74a3075f5e6d1ed32905692ff3e2d69d SHA512 53ef3087d1143dffa1ea97ac547cdf30caa654aba4487d2829b130bbf825e66a814fee09e5270cf1d9cbc57d93ee972779845350862939518e1316f0c9a0003c
+EBUILD chromium-106.0.5249.12.ebuild 37056 BLAKE2B 5229bfbac0c03d224fb214b48d9e6266b542de9993e27f9f9a17d0b9ece1c6c6a6e4039a53ab4b0ddb25dd46edada483ac657dd8c6e64cbcc1d5a818b2e253f0 SHA512 16271b214bdc3c7c464c9392763c25c99c57b61b8e4a9e5856ffd91f8b5f8f4bf2a62d68c5f6e55160d8066eb57c357bdae412fe421fdbb7d52fda62b3c1fc5c
 MISC metadata.xml 2039 BLAKE2B 165c45988d524ab5fa9562cce25997d1a54685ce1c15cfb4058ca572ba4d5ea906ba4392c59e3f492cd2b7b3ff656a33a5494e1418cb64942c69b70f271138cd SHA512 b85e969b529177a8cec0f10c4f1226fa4facb7c579c102731ae518edf25146044120a713e78f13589979c8f5b6df41e9519ac0243526b23879e3b17f966f6284
diff --git a/www-client/chromium/chromium-104.0.5112.101.ebuild b/www-client/chromium/chromium-104.0.5112.101.ebuild
index 4cf73b592641..200c78ad9df4 100644
--- a/www-client/chromium/chromium-104.0.5112.101.ebuild
+++ b/www-client/chromium/chromium-104.0.5112.101.ebuild
@@ -158,11 +158,11 @@ BDEPEND="
 	')
 	>=app-arch/gzip-1.7
 	libcxx? ( >=sys-devel/clang-12 )
-	lto? ( $(depend_clang_llvm_versions 13 14) )
+	lto? ( $(depend_clang_llvm_versions 13 14 15) )
 	pgo? (
 		>=dev-python/selenium-3.141.0
 		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14)
+		$(depend_clang_llvm_versions 13 14 15)
 	)
 	dev-lang/perl
 	>=dev-util/gn-0.1807
diff --git a/www-client/chromium/chromium-105.0.5195.102.ebuild b/www-client/chromium/chromium-105.0.5195.102.ebuild
index 83f8bcbfcc02..7040b659ff17 100644
--- a/www-client/chromium/chromium-105.0.5195.102.ebuild
+++ b/www-client/chromium/chromium-105.0.5195.102.ebuild
@@ -158,11 +158,11 @@ BDEPEND="
 	')
 	>=app-arch/gzip-1.7
 	libcxx? ( >=sys-devel/clang-12 )
-	lto? ( $(depend_clang_llvm_versions 13 14) )
+	lto? ( $(depend_clang_llvm_versions 13 14 15) )
 	pgo? (
 		>=dev-python/selenium-3.141.0
 		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14)
+		$(depend_clang_llvm_versions 13 14 15)
 	)
 	dev-lang/perl
 	>=dev-util/gn-0.1807
diff --git a/www-client/chromium/chromium-105.0.5195.52.ebuild b/www-client/chromium/chromium-105.0.5195.52.ebuild
index 224b9703357a..ac3e04c87ec0 100644
--- a/www-client/chromium/chromium-105.0.5195.52.ebuild
+++ b/www-client/chromium/chromium-105.0.5195.52.ebuild
@@ -158,11 +158,11 @@ BDEPEND="
 	')
 	>=app-arch/gzip-1.7
 	libcxx? ( >=sys-devel/clang-12 )
-	lto? ( $(depend_clang_llvm_versions 13 14) )
+	lto? ( $(depend_clang_llvm_versions 13 14 15) )
 	pgo? (
 		>=dev-python/selenium-3.141.0
 		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14)
+		$(depend_clang_llvm_versions 13 14 15)
 	)
 	dev-lang/perl
 	>=dev-util/gn-0.1807
diff --git a/www-client/chromium/chromium-106.0.5249.12.ebuild b/www-client/chromium/chromium-106.0.5249.12.ebuild
index 98e38de570c2..2a1054716170 100644
--- a/www-client/chromium/chromium-106.0.5249.12.ebuild
+++ b/www-client/chromium/chromium-106.0.5249.12.ebuild
@@ -158,11 +158,11 @@ BDEPEND="
 	')
 	>=app-arch/gzip-1.7
 	libcxx? ( >=sys-devel/clang-12 )
-	lto? ( $(depend_clang_llvm_versions 13 14) )
+	lto? ( $(depend_clang_llvm_versions 13 14 15) )
 	pgo? (
 		>=dev-python/selenium-3.141.0
 		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14)
+		$(depend_clang_llvm_versions 13 14 15)
 	)
 	dev-lang/perl
 	>=dev-util/gn-0.1807
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 046e2c577850..9bb81f5ecdc6 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_106.0.5249.30-1_amd64.deb 92105328 BLAKE2B ebd0cd7f3432c9d52eb9a9e7d6bd1e5d7c063e3eae5ba288ed03e14fc4fb058a5ea6447634bdcf754c7c63c6f834416f2d7464614c8bd21aaf5b82364b4d16ae SHA512 79b92953c9c5fc3ecbe788750ea3947db5725bc9b9436a29ab50c528eea5e815e5ae2016778108c3565ba2ae4fe0982d4f78dce72195f035c872d72b44a0e866
-EBUILD google-chrome-beta-106.0.5249.30.ebuild 2785 BLAKE2B f9e2822a6a7a709c4bd82efd7b69281c99e3646578fb38245d22f84d4bddbdda846b829100ec19940f6a6d047563df1ab283f606827081a7f3ecfebad02df522 SHA512 f5368ee498d0ec1d83b99c12ae59c6ec7da9fb58334583ac456dd77a9c782fe1ae91d15614bdaf9673c9a362c56f2f3d81b5ed82aca3d31357ebdf076e7167b5
+DIST google-chrome-beta_106.0.5249.40-1_amd64.deb 93187168 BLAKE2B d354643a5b474617f84ae516e35ff131907fc892fb6966654496ede8c767e81e6bf483e240d54cb9551fcba4912ad14fb6b3208604f3f4c3218cfc7a13d1c1a2 SHA512 67b0d32f3725d962029656e797cfe9037a1138e8db10a57bad827507b393a582a7c549fcd81f5e7f578c8b172c1e8e15bd0e602b81d0b6fadab239b656ce3830
+EBUILD google-chrome-beta-106.0.5249.40.ebuild 2785 BLAKE2B f9e2822a6a7a709c4bd82efd7b69281c99e3646578fb38245d22f84d4bddbdda846b829100ec19940f6a6d047563df1ab283f606827081a7f3ecfebad02df522 SHA512 f5368ee498d0ec1d83b99c12ae59c6ec7da9fb58334583ac456dd77a9c782fe1ae91d15614bdaf9673c9a362c56f2f3d81b5ed82aca3d31357ebdf076e7167b5
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-106.0.5249.30.ebuild b/www-client/google-chrome-beta/google-chrome-beta-106.0.5249.40.ebuild
index a43359e220bd..a43359e220bd 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-106.0.5249.30.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-106.0.5249.40.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 41d3f11b36e2..aa2c0fb5cb31 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_107.0.5286.2-1_amd64.deb 96900760 BLAKE2B c2f212b90163947465cdf3a000df2b24c9f4b2dbcf8b3e00e18903935df0cca2c50c73afeabf453d665aaefbb970f5acba2eb2cf1c3acbce263dbedee33296e7 SHA512 245dbbcce037d62a36e7b7dbaa3c06fafca69c1ae35a617742557fc62c6fa22319ce175430d8d24d97716b15450b59c879fbf34cc70e8c54da436ca33a55f5be
-EBUILD google-chrome-unstable-107.0.5286.2.ebuild 2785 BLAKE2B f9e2822a6a7a709c4bd82efd7b69281c99e3646578fb38245d22f84d4bddbdda846b829100ec19940f6a6d047563df1ab283f606827081a7f3ecfebad02df522 SHA512 f5368ee498d0ec1d83b99c12ae59c6ec7da9fb58334583ac456dd77a9c782fe1ae91d15614bdaf9673c9a362c56f2f3d81b5ed82aca3d31357ebdf076e7167b5
+DIST google-chrome-unstable_107.0.5300.0-1_amd64.deb 93552136 BLAKE2B e7cfc6cd961b93141f8982b42e3e9ecff12eac6211bab11689226357efc907c971097a8f837131cd5b6fe2f03917e79bd36a450cbe70f069fb86f94ca440d3b7 SHA512 bdca987a7fd448da78521133aabbdd67acd2c131af9c0721536ff50c756199181b2445bf6dd422a9038f3a5cdbea183a85dba216531a9fd94dc12b8484426385
+EBUILD google-chrome-unstable-107.0.5300.0.ebuild 2785 BLAKE2B f9e2822a6a7a709c4bd82efd7b69281c99e3646578fb38245d22f84d4bddbdda846b829100ec19940f6a6d047563df1ab283f606827081a7f3ecfebad02df522 SHA512 f5368ee498d0ec1d83b99c12ae59c6ec7da9fb58334583ac456dd77a9c782fe1ae91d15614bdaf9673c9a362c56f2f3d81b5ed82aca3d31357ebdf076e7167b5
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-107.0.5286.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-107.0.5300.0.ebuild
index a43359e220bd..a43359e220bd 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-107.0.5286.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-107.0.5300.0.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index c345c14305bd..292fbaf4cbe0 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_105.0.1343.23-1_amd64.deb 133597848 BLAKE2B 27ec884119f9d7429d132c5300477c1745fdd8ebc43a6d113eda0881a7ea7e325e2d0004c2460a7df0b925033aba2569b7f6272d4f695aae5321bd06a58ec10e SHA512 a96c4cf11ae7bb9c0280afb2a65e843c88fdfaf916bdee536e0cc024e93c4c87154b9946587197c1a47797acf358537510dc20b99b21b66ca0fb0a4ac1f308a7
-DIST microsoft-edge-beta_105.0.1343.27-1_amd64.deb 133614856 BLAKE2B adbeea8e111f8f64c1135464fc5c0a7c28afa54dd76cdd6ebe371d465cceb8dddb14abe5e9e70b2dc4b4f31c232b775d96871b67bfe2726a8ada620aa88b230a SHA512 af834b3115f144b813fd1bf545126dd1dabb4f187f9a5ca24a0e3124faea62ead9d44f07dd1303a63897f296506b82b82fba3d5a279e2747ef430786e3d6947c
 DIST microsoft-edge-beta_105.0.1343.34-1_amd64.deb 133977044 BLAKE2B 0afc5fba5a4cdd93702840a1acd58a6bd5726d99cb30cd0c2e2b9155302c1ada31d8d2fa055f9a6bfc87fb54502c023bfa952f888b8fcc082b9e60e7913e1abf SHA512 9a19d1a5d5af99942549231824bcd66a7668d4f115a9f346be434a533d8793e461dbeec6881069ef69a827c6242886c628783c9c3fedb8eede6af3e3416d8e17
-EBUILD microsoft-edge-beta-105.0.1343.23.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
-EBUILD microsoft-edge-beta-105.0.1343.27.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+DIST microsoft-edge-beta_106.0.1370.15-1_amd64.deb 135640180 BLAKE2B 90cbcb0f4d9b19bcd877a06f220cc71ecdbeb42c7d68c33690c0284cbf8235c9ef150859a32a2dc0a2802c031104a7a82b86452b460a8a2b28e7e1f44bb0e67e SHA512 7a1f618ecd039f0fd75fe34dbeb747f62a531e2a4edf0bc515e4c77cff887d3b4c3a68c8488ef0f506ab3b6b2e0ed593829227a89de934c2c2bab1d61d82a3b8
+DIST microsoft-edge-beta_106.0.1370.17-1_amd64.deb 135907868 BLAKE2B e302b4cf9920814b910913d361495ea7c94da47512a30aa941e80ff22bfe1a7e057e5b57a849714d515fcb10c85374e34c016ea7e0ad56e33754ad5f29dc86ca SHA512 828269e25efee9c65ebd5532584e17887019c6ef360fdbb56a63f3daaa7a6ddc6312ab87d5abce7539eaac74fd35f2b261f7506e99bab8f4ed298346a5c992f2
 EBUILD microsoft-edge-beta-105.0.1343.34.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+EBUILD microsoft-edge-beta-106.0.1370.15.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+EBUILD microsoft-edge-beta-106.0.1370.17.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-105.0.1343.23.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-106.0.1370.15.ebuild
index a8cc7e730ebf..a8cc7e730ebf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-105.0.1343.23.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-106.0.1370.15.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-105.0.1343.27.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-106.0.1370.17.ebuild
index a8cc7e730ebf..a8cc7e730ebf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-105.0.1343.27.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-106.0.1370.17.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index fa7e92dd1e80..a27d10abe90e 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_105.0.1343.33-1_amd64.deb 133907676 BLAKE2B 8b0348ebbbf4fb6962e8003dc4a0cbcade96080c420962227428beb6c1117afac619cf6501b165df7b106fe2930f77056dc48481093c99bf33f8a7f4293b0d7c SHA512 e69e59b9cd39932a4171c9e346ccfe139d9ee076f35e6d8c6162ff6f9228375e4dec89b41a5abb2988fe997b6f71da10e4ecbcb71be9267bdf2d435c1299afd5
-EBUILD microsoft-edge-105.0.1343.33.ebuild 2503 BLAKE2B 6e9465b67cd5fc35097dd61a95c915a4f3b58ac44e82efc9bfa351baf6f1581f4e68c02287881d7aafa8ce7a5d1643f6d209cc38bd64f94957f60cccde175fa5 SHA512 1f95dbc80e9b207396d6a73a7ffe21d9d44af40c15aa4b7a795c893df0720bef079dc2956ad6d34718e58100e6806a1ccaebdd5f9c71f6363ee05ec69c1893f6
+DIST microsoft-edge-stable_105.0.1343.42-1_amd64.deb 133869628 BLAKE2B 7717407d54dc035deb7f8ef1675d014da3456f1cfc3465fcfdf0baa25a285e4a4c82ef9c6c48069d219a96335ac234c70aa72e20377fcef7de72e3adf9961b96 SHA512 d230e3c562dbf168b6096ce2e83210d908b94511155d1d85a081e3fe17fc47a26ea00716855d81969a2041ca0115b6bda030c3ff7dd248269cf9e47738056f02
+EBUILD microsoft-edge-105.0.1343.42.ebuild 2503 BLAKE2B 6e9465b67cd5fc35097dd61a95c915a4f3b58ac44e82efc9bfa351baf6f1581f4e68c02287881d7aafa8ce7a5d1643f6d209cc38bd64f94957f60cccde175fa5 SHA512 1f95dbc80e9b207396d6a73a7ffe21d9d44af40c15aa4b7a795c893df0720bef079dc2956ad6d34718e58100e6806a1ccaebdd5f9c71f6363ee05ec69c1893f6
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-105.0.1343.33.ebuild b/www-client/microsoft-edge/microsoft-edge-105.0.1343.42.ebuild
index 3db12034b572..3db12034b572 100644
--- a/www-client/microsoft-edge/microsoft-edge-105.0.1343.33.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-105.0.1343.42.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 70474901c1d8..07986678c527 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index a802a232e15d..1372118053e9 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_106.0.5249.30-1_amd64.deb 92105328 BLAKE2B ebd0cd7f3432c9d52eb9a9e7d6bd1e5d7c063e3eae5ba288ed03e14fc4fb058a5ea6447634bdcf754c7c63c6f834416f2d7464614c8bd21aaf5b82364b4d16ae SHA512 79b92953c9c5fc3ecbe788750ea3947db5725bc9b9436a29ab50c528eea5e815e5ae2016778108c3565ba2ae4fe0982d4f78dce72195f035c872d72b44a0e866
+DIST google-chrome-beta_106.0.5249.40-1_amd64.deb 93187168 BLAKE2B d354643a5b474617f84ae516e35ff131907fc892fb6966654496ede8c767e81e6bf483e240d54cb9551fcba4912ad14fb6b3208604f3f4c3218cfc7a13d1c1a2 SHA512 67b0d32f3725d962029656e797cfe9037a1138e8db10a57bad827507b393a582a7c549fcd81f5e7f578c8b172c1e8e15bd0e602b81d0b6fadab239b656ce3830
 DIST google-chrome-stable_105.0.5195.125-1_amd64.deb 91239488 BLAKE2B 4f83bc55ef54d4e4454449c474e680fdd271c97da8e896d48efb8c953ddea4eccdb730f4b2d5d35e2830e2cd1f9f2a852906edaa43c9f8a205962e789cb6ab8f SHA512 80e4ed357e9a117e00f0a4d2531369990ad6ea542a65c21808ebb6f31bca7fda801c02a300c3afc8df12f97c424167f50a8520e5792759eb670e7b0041358cc1
-DIST google-chrome-unstable_107.0.5286.2-1_amd64.deb 96900760 BLAKE2B c2f212b90163947465cdf3a000df2b24c9f4b2dbcf8b3e00e18903935df0cca2c50c73afeabf453d665aaefbb970f5acba2eb2cf1c3acbce263dbedee33296e7 SHA512 245dbbcce037d62a36e7b7dbaa3c06fafca69c1ae35a617742557fc62c6fa22319ce175430d8d24d97716b15450b59c879fbf34cc70e8c54da436ca33a55f5be
+DIST google-chrome-unstable_107.0.5300.0-1_amd64.deb 93552136 BLAKE2B e7cfc6cd961b93141f8982b42e3e9ecff12eac6211bab11689226357efc907c971097a8f837131cd5b6fe2f03917e79bd36a450cbe70f069fb86f94ca440d3b7 SHA512 bdca987a7fd448da78521133aabbdd67acd2c131af9c0721536ff50c756199181b2445bf6dd422a9038f3a5cdbea183a85dba216531a9fd94dc12b8484426385
 EBUILD chrome-binary-plugins-105.0.5195.125.ebuild 1178 BLAKE2B 7e2302efe34d64e47dc50e2030eca39e319040087a38f8ae74c1c6bdfb7caec7cf198c53d83b6134ada98292c79c55a3b19ab88ae74d34023310f921652fefdc SHA512 55691ac6f5b345ad9ba9b3d531f8612d9f062bb531057c95e719fca4f447cd872ad74c575251d31331b6176c3165dbf367f5a7711dd21623663093e056aa9411
-EBUILD chrome-binary-plugins-106.0.5249.30_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
-EBUILD chrome-binary-plugins-107.0.5286.2_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+EBUILD chrome-binary-plugins-106.0.5249.40_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+EBUILD chrome-binary-plugins-107.0.5300.0_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.30_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.40_beta.ebuild
index 48788b628112..48788b628112 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.30_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.40_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5286.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5300.0_alpha.ebuild
index 48788b628112..48788b628112 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5286.2_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5300.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 4c59ae7c81d0..01841877998d 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
deleted file mode 100644
index 9c41e38df79a..000000000000
--- a/www-servers/thttpd/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX thttpd-renamed-htpasswd.patch 3387 BLAKE2B c1a42e454f380168d416a311fc893194dba87bc460c9d319d26264204832be8654195b960b591238920922b5c89360a94d49eb581ebaf9800ee597095e408f12 SHA512 0f0622ab8548ea3d3ba5f25d92d4d31f17bcd9baee3a8d0dc0d6c227b708e36bae681ace984e94f1c5e7def264866d27196a0b4c54af612ff0479d7a39a43475
-AUX thttpd.conf.sample 670 BLAKE2B 92d17d523837be7fd52e327e28318257ba38a391627dda0e10c420b193fc0c2b37876dacb64108c61e31de0581a7339db60027b2e4ac955e03d3593a7806961c SHA512 97c8582438518bf528b6d419fdb7bd94668e91e6b7033a3ed5cda4afb3539e38bf24aea5ae4b138ff2c561c95003e7f85cfa7ce88cd97e8cbbf558bc4147d2c6
-AUX thttpd.confd.1 1263 BLAKE2B 69cbb0fe3675b809183d10f6418c8e4d5d9d19d9768a64400d77b82f1bd957b0fcf5038d1317344174537e062bb7f9b662612fbe09bc41510fde009dfa7ee865 SHA512 83b8d5aebf180c398e27695bcfc9b847f6535302b4521be460ffd2e867b20fcf1083bcacdb605e557038c54631546a7ee1ba928611a6a23d786fb9f6ef9e0ee0
-AUX thttpd.init.1 735 BLAKE2B c50383feccbae81c835ccb1f0803001474dec2790916634b375b958357ca02d66f933fd7f0091f9a9918220101b1150c6e39a53bc26c29d6c6329339dbe0f1ed SHA512 991b8153fa030026e3fadc0b838b26fda75ab706e4fdaf1195931ed63be15dde290e4e3653951c78f41ec70464ed2d3dd984dc10bee4551cbf069435d447bea1
-AUX thttpd.logrotate 197 BLAKE2B 8b801de472c4c7902abf133218a6df79023bf54023c0217576ef1a23a30d4905b3d7815fbcfe3c3254a9ed86d137d1bf681f2fa187325a57442dd05ac4ded7c6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd
-DIST thttpd-2.27.1.tar.gz 96430 BLAKE2B a3b24c0345f65ddb5b6d3b1db2e2fbcad5ec3f664eb86ebfbe6eb28e50b56476f9a1467300b9ec8a2735a97fc9620a396005f3545a7760979284dd8609681e0d SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24
-EBUILD thttpd-2.27.1-r2.ebuild 1653 BLAKE2B e829a3813f6225ae16a5bffe7b3e620e474000b991ada02698617a514b5daeab65a38ded09d98f303c37ee0dc011bdc948ce7b081e57b72191437ae63695e362 SHA512 a01f8ad22d5e8b0f698fe7d9ce4c225512fcbb07635baf823c4dc7877cf51c122adb2f597caa160090c6c8a18a2aaa006355b69d6bc0b87234d9d12267c294ba
-EBUILD thttpd-9999.ebuild 1659 BLAKE2B fa6230f1d75f5b461b3885016f7a98c8b04008b4808f2f845998e4e51796b7d107e095aff57d908daf01721a858100a3d64cce7ce8d44e5c4870a73dd5fe6961 SHA512 2cc8f1ac1979fb148371ab69d7e9b40fb3ef74d7985755f75c6b5d817aec7aa97caea2231eafb7ec3f5b1be9d8c9b5cc8873079b351fc672d78fe4d5940d054d
-MISC metadata.xml 334 BLAKE2B c0c550f075fcafb2bf6e135fe5aa3107c6218a13a44eee0bfba3c094df3586b189ee7d017c7faaa4734b2a662ab6b802511ab09b267794da9c0032f051e9a793 SHA512 f470fd65a85f110bb12c7e3f9bef4e5c9461e02af22329287914a448ca95e38ae147cd48606e275492b6d301706142355cd0c6b23b06d74d55dcb606d7826753
diff --git a/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch b/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch
deleted file mode 100644
index 31e68429dbd6..000000000000
--- a/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2c2dfae..e028a0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -42,12 +42,6 @@ if test "x${WEBDIR}" = "x" ; then
- 	WEBDIR='/usr/local/www'
- fi
- 
--AC_ARG_VAR(WEBGROUP, [The group that the web server will run as])
--
--if test "x${WEBGROUP}" = "x" ; then
--	WEBGROUP='thttpd'
--fi
--
- AC_CONFIG_FILES([Makefile
-                  docs/Makefile
-                  extras/Makefile
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 303c25f..2823290 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -1 +1 @@
--dist_man_MANS = htpasswd.1 makeweb.1 redirect.8 ssi.8 syslogtocern.8 thttpd.8
-+dist_man_MANS = th_htpasswd.1 makeweb.1 redirect.8 ssi.8 syslogtocern.8 thttpd.8
-diff --git a/docs/htpasswd.1 b/docs/htpasswd.1
-deleted file mode 100644
-index 1124b02..0000000
---- a/docs/htpasswd.1
-+++ /dev/null
-@@ -1,16 +0,0 @@
--.TH htpasswd 1 "05 May 1998"
--.SH NAME
--htpasswd - manipulate HTTP-server password files
--.SH SYNOPSIS
--.B htpasswd
--.RB [ -c ]
--.I passwordfile
--.I username
--.SH DESCRIPTION
--.PP
--Sets a user's password in an httpd-style password file.
--The -c flag creates a new file.
--.SH AUTHOR
--Rob McCool.
--Modified 29aug97 by Jef Poskanzer to accept new password on stdin,
--if stdin is a pipe or file.  This is necessary for use from CGI.
-diff --git a/docs/th_htpasswd.1 b/docs/th_htpasswd.1
-new file mode 100644
-index 0000000..f524af9
---- /dev/null
-+++ b/docs/th_htpasswd.1
-@@ -0,0 +1,16 @@
-+.TH th_htpasswd 1 "05 May 1998"
-+.SH NAME
-+th_htpasswd - manipulate HTTP-server password files
-+.SH SYNOPSIS
-+.B th_htpasswd
-+.RB [ -c ]
-+.I passwordfile
-+.I username
-+.SH DESCRIPTION
-+.PP
-+Sets a user's password in an httpd-style password file.
-+The -c flag creates a new file.
-+.SH AUTHOR
-+Rob McCool.
-+Modified 29aug97 by Jef Poskanzer to accept new password on stdin,
-+if stdin is a pipe or file.  This is necessary for use from CGI.
-diff --git a/docs/thttpd.8 b/docs/thttpd.8
-index a0fd334..78af884 100644
---- a/docs/thttpd.8
-+++ b/docs/thttpd.8
-@@ -270,7 +270,7 @@ called .htpasswd by default.
- This file is formatted as the familiar colon-separated
- username/encrypted-password pair, records delimited by newlines.
- The protection does not carry over to subdirectories.
--The utility program htpasswd(1) is included to help create and
-+The utility program th_htpasswd(1) is included to help create and
- modify .htpasswd files.
- .PP
- Relevant thttpd.h option: AUTH_FILE
-@@ -562,7 +562,7 @@ This is a little tricky to set up correctly, for instance if you are using
- chroot() then the log file must be within the chroot tree, but it's
- definitely doable.
- .SH "SEE ALSO"
--redirect(8), ssi(8), makeweb(1), htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1)
-+redirect(8), ssi(8), makeweb(1), th_htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1)
- .SH THANKS
- .PP
- Many thanks to contributors, reviewers, testers:
-diff --git a/extras/Makefile.am b/extras/Makefile.am
-index b1f3b4d..ffd19d7 100644
---- a/extras/Makefile.am
-+++ b/extras/Makefile.am
-@@ -1,11 +1,7 @@
- AM_CPPFLAGS = -DWEBDIR='"$(WEBDIR)"'
- 
--sbin_PROGRAMS = makeweb htpasswd
-+sbin_PROGRAMS = makeweb th_htpasswd
- makeweb_SOURCES = makeweb.c
--htpasswd_SOURCES = htpasswd.c
-+th_htpasswd_SOURCES = th_htpasswd.c
- 
- dist_sbin_SCRIPTS = syslogtocern
--
--install-exec-hook:
--	chgrp $(WEBGROUP) $(DESTDIR)$(sbindir)/makeweb
--	chmod 2751 $(DESTDIR)$(sbindir)/makeweb
diff --git a/www-servers/thttpd/files/thttpd.conf.sample b/www-servers/thttpd/files/thttpd.conf.sample
deleted file mode 100644
index 462bd0c198d0..000000000000
--- a/www-servers/thttpd/files/thttpd.conf.sample
+++ /dev/null
@@ -1,38 +0,0 @@
-## /etc/thttpd.conf
-##
-## do not leave empty lines in here!
-## format is: key=value
-##
-## run in debug-mode?
-#debug
-##
-## what interface to bind to?
-## (default is binding to any interface)
-#host=www.example.org
-port=80
-user=thttpd
-##
-## CGI:
-##	?	match a single char
-##	*	matches any string excluding "/"
-##	**	matches any string including "/"
-##	separate multiple patterns with "|"
-#cgipat=**.sh|**.cgi
-##
-## chroot:
-chroot
-#nochroot
-##
-logfile=/var/log/thttpd.log
-pidfile=/var/run/thttpd.pid
-##
-charset=iso-8859-1
-##
-## control the caching: (in secs)
-#maxage 60
-##
-## virtual hosting:
-#vhost
-##
-## cache-control: send this "max-age" in all HTTP-responses:
-#max-age=0
diff --git a/www-servers/thttpd/files/thttpd.confd.1 b/www-servers/thttpd/files/thttpd.confd.1
deleted file mode 100644
index b5f630e7ecc2..000000000000
--- a/www-servers/thttpd/files/thttpd.confd.1
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-## Config file for /etc/init.d/thttpd
-
-## the startup-dir of thttpd is the docroot, so we specify it here
-## and the init-script does a "cd" prior to startup:
-THTTPD_DOCROOT="/var/www/localhost"
-
-## There are 2 ways to configure thttpd:
-##	1) specify all params on the cmd-line
-##	2) use a config-file (and start with "-C <conf-file>")
-
-## For additional thttpd instances, run:
-# ln -s /etc/init.d/thttpd /etc/init.d/thttpd.$NAME
-# cp /etc/conf.d/thttpd /etc/conf.d/thttpd.$NAME
-
-## Note: 1) and 2) can be mixed but
-##		the init-script set PID (option -i) to
-##			/var/run/thttpd.$NAME.run
-##		and logfile (option -l) to
-##			/var/log/thttpd.$NAME.log
-##
-## We choose 1) here -- if you have a more complicated setup read
-## thttpd(8) for details on 2).
-
-THTTPD_OPTS="-p 80 -u thttpd -r"
-
-## For a more complex setup (e.g. cgi-support) use an external configfile:
-## comment the THTTPD_OPTS line above und use the one below.
-#THTTPD_OPTS="-C /etc/thttpd/thttpd.conf"
-
-## If you know what you are doing you can add cgi-support with the line below;
-## but you _should_ use the extern-configfile version!
-#THTTPD_OPTS="$THTTPD_OPTS -c **.cgi|**.sh"
diff --git a/www-servers/thttpd/files/thttpd.init.1 b/www-servers/thttpd/files/thttpd.init.1
deleted file mode 100644
index 3b7756eae19a..000000000000
--- a/www-servers/thttpd/files/thttpd.init.1
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v3 or later
-
-depend() {
-	need net
-	use dns logger netmount
-	after sshd
-}
-
-checkconfig() {
-	if [ ! -d "$THTTPD_DOCROOT" ]; then
-		eend 1 "THTTPD_DOCROOT not set correctly in /etc/conf.d/${SVCNAME}"
-	fi
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	checkconfig || return 1
-
-	start-stop-daemon --quiet --start --exec /usr/sbin/thttpd \
-		--pidfile /var/run/${SVCNAME}.pid --chdir "$THTTPD_DOCROOT" -- \
-			-i /var/run/${SVCNAME}.pid \
-			-l /var/log/${SVCNAME}.log \
-			${THTTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --quiet --stop --pidfile /var/run/${SVCNAME}.pid
-	eend $?
-}
diff --git a/www-servers/thttpd/files/thttpd.logrotate b/www-servers/thttpd/files/thttpd.logrotate
deleted file mode 100644
index 7e75c813524a..000000000000
--- a/www-servers/thttpd/files/thttpd.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/thttpd.log {
-	daily
-	rotate 5
-	compress
-	delaycompress
-	missingok
-	notifempty
-	sharedscripts
-	postrotate
-		kill -HUP `cat /var/run/thttpd.pid 2>/dev/null` 2>/dev/null || true
-	endscript
-}
diff --git a/www-servers/thttpd/metadata.xml b/www-servers/thttpd/metadata.xml
deleted file mode 100644
index a10f670bebb5..000000000000
--- a/www-servers/thttpd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">blueness/sthttpd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-servers/thttpd/thttpd-2.27.1-r2.ebuild b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
deleted file mode 100644
index bab74ced7884..000000000000
--- a/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} = 9999* ]]
-then
-	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
-	inherit git-r3
-else
-	MY_P="s${P}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/blueness/sthttpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-RDEPEND="
-	acct-group/thttpd
-	acct-user/thttpd
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-
-WEBROOT="/var/www/localhost"
-
-src_prepare() {
-	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
-	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
-	eapply_user
-	eautoreconf -f -i
-}
-
-src_configure() {
-	econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/thttpd.init.1 thttpd
-	newconfd "${FILESDIR}"/thttpd.confd.1 thttpd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/thttpd.logrotate" thttpd
-
-	insinto /etc/thttpd
-	doins "${FILESDIR}"/thttpd.conf.sample
-
-	# move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
-	mkdir "${ED}"/${WEBROOT}/htdocs || die
-
-	keepdir ${WEBROOT}/htdocs
-
-	chown root:thttpd "${ED}/usr/sbin/makeweb" || die
-	chmod 2751 "${ED}/usr/sbin/makeweb" || die
-	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
-}
diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
deleted file mode 100644
index d26b6c0b54f5..000000000000
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} = 9999* ]]
-then
-	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
-	inherit git-r3
-else
-	MY_P="s${P}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/blueness/sthttpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-RDEPEND="
-	acct-group/thttpd
-	acct-user/thttpd
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-
-WEBROOT="/var/www/localhost"
-
-src_prepare() {
-	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
-	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
-	eapply_user
-	eautoreconf -f -i
-}
-
-src_configure() {
-	econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/thttpd.init.1 thttpd
-	newconfd "${FILESDIR}"/thttpd.confd.1 thttpd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/thttpd.logrotate" thttpd
-
-	insinto /etc/thttpd
-	doins "${FILESDIR}"/thttpd.conf.sample
-
-	# move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
-	mkdir "${ED}"/${WEBROOT}/htdocs || die
-
-	keepdir ${WEBROOT}/htdocs
-
-	chown root:thttpd "${ED}/usr/sbin/makeweb" || die
-	chmod 2751 "${ED}/usr/sbin/makeweb" || die
-	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index a73c43cb04b0..badb678bb141 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmmoonclock/Manifest b/x11-plugins/wmmoonclock/Manifest
index 4f6394663bc5..2d7d00c9c097 100644
--- a/x11-plugins/wmmoonclock/Manifest
+++ b/x11-plugins/wmmoonclock/Manifest
@@ -1,6 +1,3 @@
-AUX wmmoonclock-1.29-gcc-10.patch 990 BLAKE2B 4a2eaf6adacf7d63ca50b5096117acdbdc83be22b1563f81865495b105e1781e981bf6b5fdb0a0ed97c27d50d059a2d958252a21244a22a475abfd3e9b476cf5 SHA512 5de4007d9660a44c722e660a20833f3ebc34e855ecc3728323516982d1536c360072a7ab1fd5b07ad608460e7190ac320deb75ebf31ae811b69255f542d8459a
-DIST wmmoonclock-1.29.tar.gz 234991 BLAKE2B 7d38b4758d6bd4b78d069ae7d872c60f1a43a25fc424a51615ff0506d249bc0ee416cec9dc389ea27281f0b1eafa299bb126f0ea177334508ebb2b3542162162 SHA512 c36850034a0f3b7863ecfd03f73f91f9b935f645362cebeb33186873f700585d682dc5c35f3b5d67932afd3c5699fca56bf012e8f8a06615ff52c44a47ba552e
 DIST wmmoonclock-1.30.tar.gz 238171 BLAKE2B 05246845f95a24f4b0e1b2ce1fb790c170da2b2023337fca5517a27afccaa7a9e42efa497151059897fe87f25b2e32390f441a820afc3eaf353333faa1760d57 SHA512 2173586ef8dd53eae0a05368440dffe8438e57f8158df05fd0de2d4525a5726e48b62ef8e8a81403cb7707d836936957e2238f543946beb557623bd9fbd54175
-EBUILD wmmoonclock-1.29.ebuild 505 BLAKE2B 6176851b991d94be6c07f068905a2ffdae0e07eea8045e702bdc48b9b9a2c05576754c3cb3783d4481df7e9212ed701bd37ec64425189c9fef5df18d5e3269c0 SHA512 25e781aa2b007a44e447de9eef7c4a431c23ded06c6528de36eb18ff496664ba4a87a17de0d3b55c0ea28ebc3e3839d0826bb6632cf6de81591ed928799cbbb6
-EBUILD wmmoonclock-1.30.ebuild 461 BLAKE2B aa56eb4ff4a590055d6672e60e2903c528337cb4f01a7c5756d6ff064e41a81dd852e65870d74a85f22fdd7fcc39af6e139ab7c5a6804d1c84f68b8d28628e2c SHA512 69a571f138d42c125be4ee968e174a547faddc0ed1a6eba59c45706983b6c06f06401cfcb44b14e5386b4be81070eefd44b1b3383cf5946bc7c37a364cfeae79
+EBUILD wmmoonclock-1.30.ebuild 460 BLAKE2B 66d48ff4ade0d7670836452d5c2834f03f6c2b24719dbdd00894b530948a6b37e4edfc862f0e93fd15ebf4491446add7b2337c9a2fd6018986db1cfa8b23ba5b SHA512 7ab1fada202249f5cb32249086c27e66f103b366bd5b804b6264ddc7987b169ec57b0375e31941f59f38d0b720709c0cbe0642aca4b7e6e107ddc1c2a4fbb3bb
 MISC metadata.xml 718 BLAKE2B 6f6917dd30769a17ad6087c2e5c810cfacee7916fdde5d76173fdf1f2bedf36af50676ff3e3378d426722148078cee9f1cf9929007ef6e6d5b0bdebdb8c66cdf SHA512 f5a8409dbf9e9e243d314213e22e0f6159ceb425f76449763f405b66da91319a09395d8d2256b10dc4ed6d6668085b8a66b71483d2971283d361585e14034034
diff --git a/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch
deleted file mode 100644
index 9554254e6239..000000000000
--- a/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur wmmoonclock-1.29.orig/src/xutils.c wmmoonclock-1.29/src/xutils.c
---- wmmoonclock-1.29.orig/src/xutils.c	2017-08-15 00:32:44.000000000 +0200
-+++ wmmoonclock-1.29/src/xutils.c	2020-02-27 11:42:33.266076617 +0100
-@@ -52,6 +52,13 @@
- XpmIcon		wmgen;
- Pixmap		pixmask;
- 
-+Display		*display;
-+Window          Root;
-+Window          iconwin, win;
-+int             screen;
-+int             DisplayDepth;
-+
-+
- 
- 
- 
-diff -Naur wmmoonclock-1.29.orig/src/xutils.h wmmoonclock-1.29/src/xutils.h
---- wmmoonclock-1.29.orig/src/xutils.h	2017-08-15 00:31:51.000000000 +0200
-+++ wmmoonclock-1.29/src/xutils.h	2020-02-27 11:41:58.180058348 +0100
-@@ -20,11 +20,11 @@
- /*
-  *   Global variable
-  */
--Display		*display;
--Window          Root;
--Window          iconwin, win;
--int             screen;
--int             DisplayDepth;
-+extern Display		*display;
-+extern Window          Root;
-+extern Window          iconwin, win;
-+extern int             screen;
-+extern int             DisplayDepth;
- 
- 
- 
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
deleted file mode 100644
index 9530051db958..000000000000
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy"
-HOMEPAGE="https://www.dockapps.net/wmmoonclock"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
index ece167537a23..ac62f79bf63e 100644
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 73a5825e7129..e7dea3035c2b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
deleted file mode 100644
index d18e4da9c7c9..000000000000
--- a/x11-terms/mrxvt/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce35c887d3ccc7291231acd0cd57232e0af95404b7ca2100d05db780a1a85878f2b082ef33582b6c202d99a72cafef2e9b247397eb0358e3bd9 SHA512 f2fc886135eb2267d3cdf45d34d151146e473b5b46697e10b44649dde3a05d9ddebbe469d2d7c0b042a26c3986e7a0f88caef049d908517c9cbcf7115688c9b4
-AUX mrxvt-0.5.4-fno-common.patch 430 BLAKE2B b5fa23b21524ab486a9c95863af1f858727778a2cdec363e800666bf3518bd1dcb85fbc9e2cb5e90def93ac4243e89f1aea7c73b9c1bca225f4a88ada9415450 SHA512 1def1813c0db009534259d9319cac827d1dfb0aed3751cba9e1a56fe53ab5819a208f54f7eeef25da26302bf81ab4a43ffc7d9b47a0d60871baed6552bd505a8
-AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495
-DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3272 BLAKE2B 1a2161064aa56e619d558ca44db8ea42f32399bf8790cc221e65f876219cf46bd923100a10a948ef1bb0c89ad9cc1658639fa9c424a6698bcb05417c41f23f65 SHA512 eb9dd2cba48311c8f32d473216de69346830e0de9a0f429663730b34ca5f09b03b6e283c567f8fd0c09c8398f3ad7a20b2b048433f4c1f4fa639004b6fb1d56f
-MISC metadata.xml 479 BLAKE2B 263a42c1a71327729db5880a68363e5c704952b5952a70a4ef95d54cbfdc47682e548ee081fd5d794560e8acfc423a615795d05d5ab9c7fba9256895ecb0717f SHA512 60b34d806e18d1c35d0874613a28b53737ffeaabb99c891f7353b5361584e0fafa23e60b29ac8243249407bb5a9c71fac7d77c8bc361becb7abc96083c89310a
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
deleted file mode 100644
index bf5362b3ee37..000000000000
--- a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/tabbar.c
-===================================================================
---- ./src/tabbar.c	(revision 337)
-+++ ./src/tabbar.c	(working copy)
-@@ -1327,7 +1327,7 @@
- 		if( p.we_wordc > 1)
- 		    rxvt_msg( DBG_ERROR, DBG_TABBAR,
- 			    "Too many words when expanding %s\n", cwdOption );
--		else
-+		else if( NOT_NULL( *p.we_wordv ) )
- 		{
- 		    filename = *p.we_wordv;
- 
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
deleted file mode 100644
index 2bb39a423aed..000000000000
--- a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/rxvtlib.h
-+++ b/src/rxvtlib.h
-@@ -790,7 +790,7 @@ typedef struct {
- } action_t;
- 
- /* Values for macro_t.type. Must sync this with macroNames from macros.c */
--enum {
-+enum macroFnNames {
-     MacroFnDummy=0,
-     MacroFnEsc,
-     MacroFnStr,
-@@ -820,7 +820,7 @@ enum {
-     MacroFnSaveConfig,
-     MacroFnToggleMacros,
-     NMACRO_FUNCS
--} macroFnNames;
-+};
- 
- typedef unsigned char macro_priority_t;
- typedef struct {
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
deleted file mode 100644
index 1c2215937099..000000000000
--- a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch
-
---- ./configure.ac
-+++ ./configure.ac
-@@ -952,7 +952,7 @@
- if test "x$support_png" = "xyes"; then
-     AC_CHECK_LIB(
-         png,
--        png_check_sig,
-+        png_sig_cmp,
-         [],
-         [support_png=no],
-         [-lz -lm]
---- ./src/mpng.c
-+++ ./src/mpng.c
-@@ -83,7 +83,7 @@
-     display_depth = XDefaultDepth(display,XDefaultScreen(display));
- 
-     fread(sig, 1, 8, ifile);
--    if (!png_check_sig(sig, 8)){
-+    if (png_sig_cmp(sig, 0, 8)){
-       fclose(ifile);
-       return -1;
-     }
-@@ -113,7 +113,7 @@
- 
-     if (png_depth < 8){
-       if (png_color_type == PNG_COLOR_TYPE_GRAY ){
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-         png_row_bytes = png_width;
-       }else{
-         png_set_expand(png_ptr);
diff --git a/x11-terms/mrxvt/metadata.xml b/x11-terms/mrxvt/metadata.xml
deleted file mode 100644
index c562e92a8fcf..000000000000
--- a/x11-terms/mrxvt/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<use>
-		<flag name="menubar">Enable mrxvt menubar</flag>
-		<flag name="utempter">REcords user logins. Useful on multi-user
-			systems</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">materm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
deleted file mode 100644
index f9311471c350..000000000000
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
-HOMEPAGE="http://materm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
-IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng:= )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		virtual/libiconv
-	)
-	utempter? ( sys-libs/libutempter )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
-	"${FILESDIR}"/${P}-libpng14.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# if you want to pass any other flags, use EXTRA_ECONF.
-	if use l10n_el ; then
-		myconf="${myconf} --enable-greek"
-	fi
-	if use l10n_ja ; then
-		# --with-encoding=sjis
-		myconf="${myconf} --enable-kanji --with-encoding=eucj"
-	fi
-	if use l10n_ko ; then
-		myconf="${myconf} --enable-kr --with-encoding=kr"
-	fi
-	if use l10n_th ; then
-		myconf="${myconf} --enable-thai"
-	fi
-	if use l10n_zh-CN ; then
-		# --with-encoding=gbk
-		myconf="${myconf} --enable-gb --with-encoding=gb"
-	fi
-	if use l10n_zh-TW ; then
-		myconf="${myconf} --enable-big5 --with-encoding=big5"
-	fi
-
-	# 2006-03-13 gi1242: mrxvt works best with TERM=rxvt AND correctly set
-	# termcap / terminfo entries. If the rxvt termcap / terminfo entries are
-	# messed up then then it's better to set TERM=xterm.
-	#
-	# Provide support for this by setting the or RXVT_TERM environment variables
-	# before emerging, as done in the rxvt ebuild.
-
-	if [[ -n ${RXVT_TERM} ]]; then
-		myconf="${myconf} --with-term=${RXVT_TERM}"
-	fi
-
-	econf \
-		--enable-everything \
-		--with-atab-extra=25 \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable xpm) \
-		$(use_enable session sessionmgr) \
-		$(use_enable truetype xft) \
-		$(use_enable utempter) \
-		$(use_enable menubar) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} install
-	# Give mrxvt perms to update utmp
-	fowners root:utmp /usr/bin/mrxvt
-	fperms g+s /usr/bin/mrxvt
-	dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO
-}
-
-pkg_postinst() {
-	if [[ -z ${RXVT_TERM} ]]; then
-		einfo
-		einfo "If you experience problems with curses programs, then this is"
-		einfo "most likely because of incorrectly set termcap / terminfo"
-		einfo "entries. To fix this you can dry and run (as user)"
-		einfo "	tic /usr/share/doc/${P}/etc/mrxvt.terminfo"
-		einfo "Alternately, run the offending programs with TERM=xterm."
-		einfo
-		einfo "To emerge mrxvt with TERM=xterm by default, set the RXVT_TERM"
-		einfo "environment variable to 'xterm', or your desired default"
-		einfo "terminal name. Alternately you can put 'Mrxvt.termName: xterm'"
-		einfo "in your ~/.mrxvtrc, or /etc/mrxvt/mrxvtrc."
-		einfo
-	fi
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-09-18 23:20:40 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-09-18 23:20:40 +0100
commit	f39c6dab71f5188f95650d367ece1df4f263e474 (patch)
tree	9c30c203b3f09174814c41e6a63aa3522c7b7610
parent	1b295861f983d29f9bd5d5906c7ca3cee4cf1f9a (diff)