gentoo auto-resync : 08:10:2022 - 01:28:43

author: V3n3RiX <venerix@koprulu.sector> 2022-10-08 01:28:43 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-08 01:28:43 +0100
commit: ad75ca50360f9590325f0f709c091832b70eab1d (patch)
tree: 8a0b109f05da2a3728e461abf6e31347c2e8b0b2
parent: 7b5e4e1f63da7fb63fba5f1a9fc41866c8ae5b2f (diff)
311 files changed, 2588 insertions, 2427 deletions
diff --git a/Manifest b/Manifest
index 5470a5f5f00b..edc77a6a591c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29614 BLAKE2B 294bb573b4b55e273009f37ed5e8c946c674e6c8472f66c3912691b9d71711b860eda31faf0389f72c6c875cf7e94f141dc62ab047a804cf45a5f072b223a311 SHA512 7d18be7fc1df8cc627e134d3ce1f3c0bfc4f8eeb4c2df0e952da3c7b593a026c7585090166a0e4d9504f2d9323260c55270edb8348de5702fb3dca017599c1cf
-TIMESTAMP 2022-10-07T17:40:04Z
+MANIFEST Manifest.files.gz 29602 BLAKE2B 60a59ab770ac33742d3a326d1bdc20e074dfaeb3583ac7a07a6564e1221b603af2f5941edb35f849d0bce9e704b9b3c150a949b94f47385d6c721b72fb7c4d5c SHA512 b2bb72211e02f2e12c61ec60bf200300723bfc769557f48a97284622f9eb1c82fec2912e7edd84c8ab137183031e21efee4387bd47792ce235d8963377740ffc
+TIMESTAMP 2022-10-07T23:40:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNAZHRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNAuNhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB6HhAAnSSlLe0z6paXPw0SI3WwspXAf0R3wC1/XSHYHYoaxKcaOUkWbBkzPLt3
-/XCSRHE/8HcWd1JpMM1TxKYLpne29IyVEOH8KLv1IUXknuAuLzQVK7W5V+1EzUPQ
-+sMNqWF3heEcZheHAFaB4vG6cO0yW990a6EDxevNKstuVWqtainr1c/GQvG8QvQV
-V4AawYikjkdpO2bWePpiJWzHFYt2v41rEl7kXSeLgLTJsdfU3NqGtoCchgVfeS53
-b1E9EpkoosgGALPUVujqsytdDNiRwy39Nb5Pe0p5iBz0cpcPYyQE1nHYuEOh25m1
-WcJ+ssPCJL10lq6DSQClEPBA7o0jEZPbkS1mmdTHfGew6Ty6h/2UNSImFn3XFMME
-nznpKwaVU18BBB4ZBZWcBhFWhcWqJ0wdfNF6/XuKIW79sXn91L/FqKs+GZFXSf2x
-05GLgNOZTDZGaK6/YW4RdlLF3RlrS4ktGAqjb8B4Ynuvpt9KTvxWXoIjHSzagBxD
-ffPgJS11icugfIy+HsqXFgSxpOFXdVMAjmmn3FdHSh+EXTWLlpBC1NfST74AwhT3
-zRGrgimaQJRKwBGPmpHP1F2rUFnfzCTENhp7eq6iLgs93/TfiqslyrfhU4Jh7Avt
-sTd/ssdOxM8X0oKnSRvS3b0Le/g0IUeqgC0EE1A4Iq3JZeYTGCg=
-=CbKC
+klAJCg//ZqtnV8N5CmQKYP/sRT3vdd3t+4xnnwP6k+WJcnZPcmqBHTghauodS/Is
+QbMKIgI8ByuyejKk6Cnij9L7kVln/4HWQdL9WGbf+UIVw2+glOYfGEGF2C9xk1qY
+MWE9a60G8NEjl1DEOonSwxHKq7+3tIl/jun0hHnqgVVGKrDm9hFc6HVk2BZZPKde
+/551vU/J0cwXiJU6Cibmevp5/ebkuXVSval2qqFkdZP+yBdzyrDi235OM6dzYznK
++PRe3N61ICmpNEX66kWvTmtDiPCoIvA1+aP5itC9Gawof0ozkcqSGxy5iy4tHpnC
+wGrjqERRS8ChY6sBo0MUh3jP0zgS/7cHruN25MhUsPxzLn1o7C32yJJb/Bh5XRAB
+rrYf9rDkOk6/Nn1mfr3HOQd+cQjLpBEDoNwGBipaBOU3ysLou6jlssNWs8xd7+s6
+MAgzF2QKSy0DA5fXccYsf1WPa0nTTpKg/jVQ9HFlk0IP/UuHhEThBem6xvdsRSot
+kJS7FmJzlIJx2fxc7+q2ClNf4QsN9R4Mv01TCgEXz8oFuC2lu0a+vjzL5DfuUd5w
+HqpmGRcZ4hGk8dlzSbG2cE2+Hk/SsqG6XpG2d5oErPh+lMkSb3NsSEuCX0rNGEZm
+n+HH1+REoIyCoVLYGNYn1ngDJ16GdlfIEG0wRdQ6xMDdW6gOMr0=
+=/U1/
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 586deb82e3fa..6dbf04331543 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 73dcdbc8a5a2..f4468d535b40 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/attic/Manifest b/app-backup/attic/Manifest
deleted file mode 100644
index 39443922c2be..000000000000
--- a/app-backup/attic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST attic-0.16.tar.gz 87985 BLAKE2B cc801d8e3b28f6041c053f368c1d5ab00b1b419928d6a84647da7dccb7fb46b477898249873e90ba15c721468c09ae243d450fc978fe8cc3947b2c2e035f2aae SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c
-EBUILD attic-0.16-r1.ebuild 855 BLAKE2B 3f620101b85f10fd04cd1c99c782956ef70ccc587f49293ff1747d60c7ebd93ae8e47ed39bda1d7420f0103abf47942ee80d397435601407f4c9217b7afae684 SHA512 95bdfdabf046aaf57c8c04e64ae81a2148f868cb2d2832d8532f4dccdd851ff6ebb4b77a026ba70d339185a02a58a79c5008be8e17b48a5fa5a74d7788378319
-EBUILD attic-9999.ebuild 855 BLAKE2B 3f620101b85f10fd04cd1c99c782956ef70ccc587f49293ff1747d60c7ebd93ae8e47ed39bda1d7420f0103abf47942ee80d397435601407f4c9217b7afae684 SHA512 95bdfdabf046aaf57c8c04e64ae81a2148f868cb2d2832d8532f4dccdd851ff6ebb4b77a026ba70d339185a02a58a79c5008be8e17b48a5fa5a74d7788378319
-MISC metadata.xml 329 BLAKE2B 31b7cfffd24bba11f1df3512a2501ccc9cd86cc43ef5ee9bea5939c4a6b485d1fc182fe3d25ad11bd9289d3e4e9f86e4b18f4e875b0830a1d9550fa0a226b15d SHA512 0a8f9fdbc2fe52ab5b7dafe4a1558b066d712aaaa7181977f5076ef0defc64d25e79e9c7640142f7d24cf78858bc3b9d2d7cbc0b9d879ca3009ce842fc09f1b6
diff --git a/app-backup/attic/attic-0.16-r1.ebuild b/app-backup/attic/attic-0.16-r1.ebuild
deleted file mode 100644
index 381506ecc41d..000000000000
--- a/app-backup/attic/attic-0.16-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jborg/attic.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Attic is a deduplicating backup program written in Python"
-HOMEPAGE="https://attic-backup.org/"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-libs/openssl:0=
-	dev-python/llfuse[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	${RDEPEND}"
-
-python_prepare_all() {
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild
deleted file mode 100644
index 381506ecc41d..000000000000
--- a/app-backup/attic/attic-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jborg/attic.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Attic is a deduplicating backup program written in Python"
-HOMEPAGE="https://attic-backup.org/"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-libs/openssl:0=
-	dev-python/llfuse[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	${RDEPEND}"
-
-python_prepare_all() {
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-backup/attic/metadata.xml b/app-backup/attic/metadata.xml
deleted file mode 100644
index 5a66707c1413..000000000000
--- a/app-backup/attic/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">jborg/attic</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 45d6fbd1d86c..3a375e306e9b 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 17284b057976..dce20925088b 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -2,11 +2,7 @@ AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74
 AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST podman-4.1.0.tar.gz 10904727 BLAKE2B 6d01a65b13494dc948c0667147eca6f250a81056f1bcf6eda6285566b8aa7aa526794ea96a571aecad642a8b1d3d1877cd31683ccf46662f8681a2afac083b5a SHA512 4d5f240423f21b1224ce44853a2265359dacee0d921f0ea53a7fca34f9076ebfaa49f4327a59ac51f5bf5b9dafb47dda3a9bb8e609237cc69f833b42b95bcd0a
-DIST podman-4.1.1.tar.gz 10905391 BLAKE2B a094785ccb7a84a42147fb0f0360480ad4f73a1cdaa29b666fabb08528584f5d37b1cf8fb807351d4a60d81779de4dec3ab5fc83275061eded21f97fd3fa5e7f SHA512 19dd2800b59dacf7edd5d8204bdaffa0959910c7751b582f5a12b8d644b52f9d6581b9c3b4cba3ddb0707f6a90c0dbc93de6d8e2eaa6a4234ebb9dfa28e693b3
-DIST podman-4.2.0.tar.gz 13019518 BLAKE2B a3b8d8b140b9d34e24f87f998fff3558649487b503bdd437f537f09adc51819d81786b6b4e858ef4e8a43c0d872cd20cd1ceee06988a36f830b9ffbb5109d14d SHA512 bc9e28d9938127f91be10ea8bc6c6f638a01d74d120efad5ad1e72c5f7b893685871e83872434745bc72ecaca430355b0f59d302660e8b4a53cc88a88cc37f9c
 DIST podman-4.2.1.tar.gz 13047683 BLAKE2B 968dc88164c846108d920dfbd3796078b6e7cde6c6d884ac5ea3379abe9a3d0ea72a78b10eea644a1040d1d564c13f05fe69112c49084344e95095c50ff537d5 SHA512 a8a6e3228c1cb6860bb27515bd081b5c395a17bd69fab8797758b84631d08d2389e554621080e66ecc04818c1c4d132ea6ed0edfedcfea6d7886a70ebc95297d
 EBUILD podman-4.1.0-r1.ebuild 4782 BLAKE2B 057db822cd7588941c59d8efd32d2170d42ef4f95880eefa23dafdcc834d377e3df5ca8a3cdc9757d37fe133960225251884316688ec04e921de0e3baa0d69b8 SHA512 64b1c4dfa38678b81f5e563c2634fe78cb41b1d98e893091a405c47a3ea13bb8411b376fcf1ff1794ac24fcc7efe704e4daa6c9aeba92f0bba2498415103c9c6
-EBUILD podman-4.1.1-r1.ebuild 4784 BLAKE2B 1135e265f0c8eb048244124b856e303fc6b45f7ae07167cff41a74613465873600004103733aec711df98f34a2157deb6ce94b728bbfee9b5f143accf8d4e1f5 SHA512 ad69026e96fd27293215a646e21668d3ee99b01a4069f038dc6bdc5542c01653eafb5fa77b933b273e327b799acd9246cc043280feab4d3b1523cc51c0ba5cff
-EBUILD podman-4.2.0-r1.ebuild 4784 BLAKE2B 161825694f430224c3be43cb5041b314e1d4cfed65f177c56c4fb957063e9d691c7a739f7f6dda8c84df2f3b3d8f638a3fc38019638dc976716a1af91aa9cda0 SHA512 31814c43d8ff5f34bd7f18fc84aee44a38b10632d559e314e93413b6dc1ac6d5d815155693577e7464af00df6a0030e64aeddcd321a0fadd4b76a7fa120a49ea
 EBUILD podman-4.2.1.ebuild 4784 BLAKE2B f0b71f8b5c64a44a511783f45d8a6d42786e5f40c6fd2edf7ac5e31e48af29c90d814603d776fe89da9d5599351c436abac176b070bdb26190b8ab234febd561 SHA512 a7e38f492a2c6cd3e0d8f47138b1c35bcfdcfc322c089b2149025b5c066061c01187ed5a19202ef2a95173e9aa63d9eff76269efc9fbb110de939cb0c3fcf417
 MISC metadata.xml 1309 BLAKE2B f4e08317d4ed405eca3964b49bbc3a5b8a915245bc5e2b3912d254ee3e75e6475d44879b1118a34bd3fe7568d9be9f4747303eba821cda94d97a16d693f71b49 SHA512 ebabde88fb088061c48400021521c9b8b35f1c5af6a3bb8194f8eb1f4bad2506b77ed8ee8a30e76eb4e262c3d132e03930d23feb43a82604499a5c49ee35886f
diff --git a/app-containers/podman/podman-4.1.1-r1.ebuild b/app-containers/podman/podman-4.1.1-r1.ebuild
deleted file mode 100644
index acb3d4006941..000000000000
--- a/app-containers/podman/podman-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="f73d8f8875c2be7cd2049094c29aff90b1150241"
-
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_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 ~ppc64 ~riscv"
-IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	>=app-containers/cni-plugins-0.8.6
-	sys-apps/shadow:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	fuse? ( sys-fs/fuse-overlayfs )
-	selinux? ( sec-policy/selinux-podman )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	local makefile_sed_args=(
-		-e '/^GIT_.*/d'
-		-e 's/$(GO) build/$(GO) build -v -work -x/'
-		-e 's/^\(install:.*\) install\.python$/\1/'
-		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
-	)
-
-	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
-	sed "${makefile_sed_args[@]}" -i Makefile || die
-}
-
-src_compile() {
-	local git_commit=${EGIT_COMMIT}
-
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	# Avoid this error when generating pkg/varlink/iopodman.go:
-	# cannot find package "github.com/varlink/go/varlink/idl"
-	mkdir -p _output || die
-	ln -snf ../vendor _output/src || die
-	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
-	rm _output/src || die
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${git_commit}" \
-			GIT_COMMIT="${git_commit}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
-	newconfd "${FILESDIR}"/podman.confd podman
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/*
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/*
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf
-
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-containers/podman/podman-4.2.0-r1.ebuild b/app-containers/podman/podman-4.2.0-r1.ebuild
deleted file mode 100644
index 7a38e059a972..000000000000
--- a/app-containers/podman/podman-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="7fe5a419cfd2880df2028ad3d7fd9378a88a04f4"
-
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_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 ~ppc64 ~riscv"
-IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	>=app-containers/cni-plugins-0.8.6
-	sys-apps/shadow:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	fuse? ( sys-fs/fuse-overlayfs )
-	selinux? ( sec-policy/selinux-podman )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	local makefile_sed_args=(
-		-e '/^GIT_.*/d'
-		-e 's/$(GO) build/$(GO) build -v -work -x/'
-		-e 's/^\(install:.*\) install\.python$/\1/'
-		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
-	)
-
-	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
-	sed "${makefile_sed_args[@]}" -i Makefile || die
-}
-
-src_compile() {
-	local git_commit=${EGIT_COMMIT}
-
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	# Avoid this error when generating pkg/varlink/iopodman.go:
-	# cannot find package "github.com/varlink/go/varlink/idl"
-	mkdir -p _output || die
-	ln -snf ../vendor _output/src || die
-	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
-	rm _output/src || die
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${git_commit}" \
-			GIT_COMMIT="${git_commit}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
-	newconfd "${FILESDIR}"/podman.confd podman
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/*
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/*
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf
-
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 24e998669c52..93a61ccfc792 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index 449683331cce..5bb2eb4c5bf1 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -1,5 +1,7 @@
 DIST kramdown-rfc2629-1.6.11.gem 55296 BLAKE2B ed2f60e4ad5c4d35acbcfeb0b7d57928a2b9c5d7676379ce5cfee11de21a7d02593218b9728ce11b828cb28055f1580c474a176f751d7239315b8857893a3733 SHA512 da97a25df4efb4e618fc3b35cdc7fd7343d670758e2af4aefe16212054063f3d682ba59ad961eed54594ce76e45e5f7f90e1237b96ca31808e06c757c0c284d7
 DIST kramdown-rfc2629-1.6.13.gem 55296 BLAKE2B c880e114567739ca99af76457cbca5b13bb5554c2016fac1a3233eb8e32db0ecfbb2e91d42109f53c34e284bffa9d501ce65b037dfc468b173c6ffa83ecf0a88 SHA512 8c1f9cf69d83c02b5b2b2793d35add9ca5207a5e412dfcf674c2f0f9f835f8b1a2c0afa96c77b5771e8cd116d63ab1bee9a0f507dc03535fe3566da2d2bc759e
+DIST kramdown-rfc2629-1.6.17.gem 55808 BLAKE2B 7b3d8359eab9dc9ac9a2beeba74c541a75a9d92418f8f2f16798fb893a45c8347d4c51f11eb9d3032adae71324c5c67a0dcd809c8be06acd831a3615759f3b55 SHA512 e2284db908fa1ef5aa9b36ff6868b11d87a7e6622dce3c540878661eae837b378ed913af12df35d86b5cc8c233ae55e3ad981471390717b2ead3fcd0f3ca781e
 EBUILD kramdown-rfc-1.6.11.ebuild 800 BLAKE2B 9872e769c58aa2155179542b6783310fe36607407eb709bb5c63519f8d1084f6f82c5cb1fdf8714adb9375e115bf0896ea47fbfe1d8fa1d08bff5889a134a36b SHA512 0b8725030e26ea1113ed58d4ab58d0ac0dd991f1e8de4c625d06ca58debd4143b83473f08e1f4ebe70ef66308a6f961c83c6349a2b3a68b981f026d851179d37
 EBUILD kramdown-rfc-1.6.13.ebuild 800 BLAKE2B 9872e769c58aa2155179542b6783310fe36607407eb709bb5c63519f8d1084f6f82c5cb1fdf8714adb9375e115bf0896ea47fbfe1d8fa1d08bff5889a134a36b SHA512 0b8725030e26ea1113ed58d4ab58d0ac0dd991f1e8de4c625d06ca58debd4143b83473f08e1f4ebe70ef66308a6f961c83c6349a2b3a68b981f026d851179d37
+EBUILD kramdown-rfc-1.6.17.ebuild 801 BLAKE2B 936e656d5b9b93d245ffe4f1a277f79e6e40c00bd37c5b953f21985bd55a5efb434657508aa597f1c95a55e80086107c6c9d4f01c9ec2dfcc18346f32a7ea8b0 SHA512 09876d056d37ab979e5f828989c8e4795a172e084e5bd01321c2d5e8a112f2f1317e04aabec52d95aaa7358627c0476b1a9f8d5e17d207e64d47363064cda67e
 MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild
new file mode 100644
index 000000000000..c39dcb1683d4
--- /dev/null
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+# The software got renamed from kramdown-rfc2629 to kramdown-rfc,
+# however the gem coordinate is still kramdown-rfc2629.
+RUBY_FAKEGEM_NAME="${PN}2629"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/certified-1.0.0
+	>=dev-ruby/json-2.0.0
+	>=dev-ruby/kramdown-2.4.0
+	>=dev-ruby/kramdown-parser-gfm-1.1.0
+"
+
+all_ruby_prepare() {
+	sed -i 's/json_pure/json/' ../metadata || die
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index d019dba986a4..334677658eed 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,12 +1,6 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
 AUX mupdf-1.15-openssl-x11.patch 668 BLAKE2B 40810d21718e0f30e47e3d61fc3c10442568565e519d2713f952fb11355fc532717ef2df40a074c0c79ed725d34e639e9fbde02694b5ae7a76ae9a9ef9a36acb SHA512 89cd9bbef7c7e920aacf1de4a513fb98199ff2f033818b617203a4517a2aeb7ad5ed4a3720ceb6dec370560d85759c973a7c15d9a47924d0c3d51cd3a9c6ad5b
-AUX mupdf-1.18-Makefile.patch 1246 BLAKE2B e0054c441b067ef4aec069cb0fd4342f16919af51ac53096f20a2dbc87a81e2bece8478441df493d6825eedca53f4c9634cfe8724980da119d0ac20035a4d423 SHA512 def7524e0468ca15220b2d9c718ef61da4ce007c43f591ae3ad80afe55f86549985b1c5ec3d3d266045a0a6ca399580f8f4e001893d4feaabb7785a8a4df278e
-AUX mupdf-1.18.0-CVE-2021-3407.patch 1597 BLAKE2B acd956c6b2c50f1699af32c264c38bc2bd7c6d07de2b3d52b28aa44d63766f6a3f5d95400b0d364c4baf3949022bba6e7be33ae7c33831308c2e006fe8d061f6 SHA512 c63da7cd1c245e7b10a6823998a42398981c16ec87d059779d14d44f2c5d87adcd58b0d7b758e6aa22c04f7cc68f3989b882456122ca1cc9d6cd0a5ae79ca21e
-AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799db5d21274feb3699f2bca04fd3d93528d86e2ef05ccf25d1a0800e81a333d0703f837d45fef926746aeec1ece60c6ced SHA512 0e7a91474c3f31a5d5f7ddc461d74f1bc0cc8de7eb7bedbaa0f6335a6038327f5c7261d16baade5dba567b3d1ad49adf7a65ea40b226fca5f1eb58cc7bc0b07a
-AUX mupdf-1.18.0-darwin.patch 1001 BLAKE2B 1d6f8452cda38dfca3b0e62069a560ed6119d02b391eb29740d093883a7eedb776df7d7a561fb116eee3315bd497a64658927d299af8315d0dc8215e300e192a SHA512 6ed41a5b61859cc6fdac2b5c93fbb6e6e16dfd9540d0950e702935c28e3793006d72dd178a95d6ccb06d1b76b5df7dd439006bbe5d98210c2985ee91c263d755
-AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
-AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 AUX mupdf-1.19.0-Makefile.patch 1043 BLAKE2B 7f449713700d57c0bf072661babcb5122d09be82a0b89520999618e22c7b44ae950f0e9fd653330d34078229da8bd36f8e5fd273c5110cbeaeb47347b3e4f666 SHA512 ddbc11d3bf7a1480effd57c9587b85d735c97c5215dbf9dc66bac535356f9cbc5ecc0dd1003c367d6e60d969383afdd9014a66e8fb51384632be407fe01694d4
 AUX mupdf-1.19.0-cross-fixes.patch 5740 BLAKE2B dcc38e628e1c0ddde9647d06ea8c58124cb7a1fe771e88465c0516ff3d1b50b820d2110107428bd762abe85905bc7b6cc283067ece88471442e76fab2fcaf2a9 SHA512 db4093d330c8ce9c9d1bfee5b708dd423e04eb6f2d5c87f8e5779d28bdd320f15b6847a308e87d183c9b38c5396c0518b70325ea09c9e8f4a733750e4cf5ca13
 AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a72e7557e89b3830ac55bc713982065d1ec7055b84b91589c8b98a690d037c0fb6c90480fd89989e0f90cc49f9b97 SHA512 24cb6885c174bbfbe5ddc2e8f9a15c5154aa5699a19b5931d60ebb761a7587d717dbb65fba45070f963c0c3f432f8f58c00537d10b050546173a48f5c729a7c4
diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
deleted file mode 100644
index 32ee7e57c493..000000000000
--- a/app-text/mupdf/files/mupdf-1.18-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b0fb617..528e117 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
- 
- ifndef build
--  build := release
-+  build := debug
- endif
- 
- ifndef OUT
-@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO)
- 
- $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ)
- else
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
-+MUPDF_STATIC = $(OUT)/libmupdf.a
-+THIRD_LIB = 
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
-+	$(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- endif
-@@ -374,7 +376,7 @@ install: libs apps
- 
- 	install -d $(DESTDIR)$(docdir)
- 	install -d $(DESTDIR)$(docdir)/examples
--	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
-+	install -m 644 README CHANGES $(DESTDIR)$(docdir)
- 	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
- 	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
- 
diff --git a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
deleted file mode 100644
index 566ee562389c..000000000000
--- a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://bugs.gentoo.org/772311
-
-From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001
-From: Robin Watts <Robin.Watts@artifex.com>
-Date: Fri, 22 Jan 2021 17:05:15 +0000
-Subject: [PATCH 1/1] Bug 703366: Fix double free of object during
- linearization.
-
-This appears to happen because we parse an illegal object from
-a broken file and assign it to object 0, which is defined to
-be free.
-
-Here, we fix the parsing code so this can't happen.
----
- source/pdf/pdf-parse.c | 6 ++++++
- source/pdf/pdf-xref.c  | 2 ++
- 2 files changed, 8 insertions(+)
-
-diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
-index 7abc8c3d4..5761c3351 100644
---- a/source/pdf/pdf-parse.c
-+++ b/source/pdf/pdf-parse.c
-@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
- 		fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num);
- 	}
- 	gen = buf->i;
-+	if (gen < 0 || gen >= 65536)
-+	{
-+		if (try_repair)
-+			*try_repair = 1;
-+		fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen);
-+	}
- 
- 	tok = pdf_lex(ctx, file, buf);
- 	if (tok != PDF_TOK_OBJ)
-diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
-index 1b2bdcd59..30197b4b8 100644
---- a/source/pdf/pdf-xref.c
-+++ b/source/pdf/pdf-xref.c
-@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
- 	{
- 		ofs = fz_tell(ctx, doc->file);
- 		trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL);
-+		if (num == 0)
-+			fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n");
- 	}
- 	fz_catch(ctx)
- 	{
--- 
-2.17.1
-
diff --git a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
deleted file mode 100644
index 0576033a03a2..000000000000
--- a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Refreshed patches based on:
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
---- a/Makefile
-+++ b/Makefile
-@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
- 
- HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
- 
-+$(HEXDUMP_EXE): scripts/hexdump.c
-+	$(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
-+
- FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
- FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
- FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
---- a/Makerules
-+++ b/Makerules
-@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW)
- OS := $(OS:Windows_NT=MINGW)
- OS := $(OS:Darwin=MACOS)
- 
-+PKG_CONFIG ?= pkg-config
-+CC_FOR_BUILD ?= $(CC)
-+
- ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
-   # clang does not support these in combination with -fembed-bitcode
-   CFLAGS += -ffunction-sections -fdata-sections
-@@ -128,51 +128,51 @@ else ifeq ($(OS),MACOS)
- else ifeq ($(OS),Linux)
-   HAVE_OBJCOPY := yes
- 
--  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
--	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
--	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
-+	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
-+	SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
-   endif
--  ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
--	SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
--	SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
-+  ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
-+	SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
-+	SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
-   endif
--  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
--	SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
--	SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
-+  ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
-+	SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
-+	SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
-   endif
--  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
--	SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
--	SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
-+	SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
-+	SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
-   endif
--  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
--	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
--	SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
-+  ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
-+	SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
-+	SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
-   endif
--  ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
--	SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
--	SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
-+	SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
-+	SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
-   endif
--  ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
--	SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
--	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-+  ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
-+	SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
-+	SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
-   endif
- 
--  HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
-+  HAVE_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
-   ifeq ($(HAVE_LEPTONICA),yes)
--	SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
--	SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
-+	SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
-+	SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
-   endif
- 
--  HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes)
-+  HAVE_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract-ocr >= 4.0.0' && echo yes)
-   ifeq ($(HAVE_TESSERACT),yes)
--	SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
--	SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
-+	SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
-+	SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
-   endif
- 
--  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+  HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
-   ifeq ($(HAVE_SYS_CURL),yes)
--	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
--	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+	SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
-+	SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
-   endif
- 
-   HAVE_GLUT := yes
-@@ -183,14 +183,14 @@ else ifeq ($(OS),Linux)
- 
-   HAVE_X11 := not-unless-portage-tells-me
-   ifeq ($(HAVE_X11),yes)
--	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
--	X11_LIBS := $(shell pkg-config --libs x11 xext)
-+	X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
-+	X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
-   endif
- 
-   HAVE_LIBCRYPTO := not-unless-portage-tells-me
-   ifeq ($(HAVE_LIBCRYPTO),yes)
--	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
--	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-+	LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
-+	LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
-   endif
- 
-   HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
deleted file mode 100644
index cdd8ccf0f40d..000000000000
--- a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/Makerules
-+++ b/Makerules
-@@ -117,11 +117,11 @@ ifeq ($(OS),MINGW)
- else ifeq ($(OS),MACOS)
-   HAVE_GLUT := yes
-   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
--  SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
--  CC = xcrun cc
--  AR = xcrun ar
--  LD = xcrun ld
--  RANLIB = xcrun ranlib
-+  SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
-+  CC ?= xcrun cc
-+  AR ?= xcrun ar
-+  LD ?= xcrun ld
-+  RANLIB ?= xcrun ranlib
- 
- else ifeq ($(OS),Linux)
-   HAVE_OBJCOPY := yes
---- a/Makerules
-+++ b/Makerules
-@@ -122,9 +122,7 @@ else ifeq ($(OS),MACOS)
-   AR ?= xcrun ar
-   LD ?= xcrun ld
-   RANLIB ?= xcrun ranlib
--
--else ifeq ($(OS),Linux)
--  HAVE_OBJCOPY := yes
-+endif
- 
-   ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
- 	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
-@@ -197,8 +195,6 @@ else ifeq ($(OS),Linux)
- 	PTHREAD_LIBS := -lpthread
-   endif
- 
--endif
--
- # The following section has various cross compilation configurations.
- #
- # Invoke these as:
diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
deleted file mode 100644
index dc4000b4cde6..000000000000
--- a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
+++ /dev/null
@@ -1,102 +0,0 @@
-From b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54 Mon Sep 17 00:00:00 2001
-From: Robin Watts <Robin.Watts@artifex.com>
-Date: Thu, 8 Oct 2020 16:15:40 +0100
-Subject: [PATCH] Bug 701297: Harden populate_ui against unexpected repairs.
-
-We count the number of layers, and allocate space for them in
-an array. We then walk the tree reading details of those layers
-in. If we hit a problem that causes a repair while reading the
-information, the number of layers can magically increase. In
-the existing code we run off the end of the array.
-
-In the new code we watch for hitting the end of the array and
-realloc as required.
----
- source/pdf/pdf-layer.c | 32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c
-index 177f0c947..b8e9d7cad 100644
---- a/source/pdf/pdf-layer.c
-+++ b/source/pdf/pdf-layer.c
-@@ -104,10 +104,27 @@ count_entries(fz_context *ctx, pdf_obj *obj)
- }
- 
- static pdf_ocg_ui *
--populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
-+get_ocg_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill)
-+{
-+	if (fill == desc->num_ui_entries)
-+	{
-+		/* Number of layers changed while parsing;
-+		 * probably due to a repair. */
-+		int newsize = desc->num_ui_entries * 2;
-+		if (newsize == 0)
-+			newsize = 4; /* Arbitrary non-zero */
-+		desc->ui = fz_realloc_array(ctx, desc->ui, newsize, pdf_ocg_ui);
-+		desc->num_ui_entries = newsize;
-+	}
-+	return &desc->ui[fill];
-+}
-+
-+static int
-+populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
- {
- 	int len = pdf_array_len(ctx, order);
- 	int i, j;
-+	pdf_ocg_ui *ui;
- 
- 	for (i = 0; i < len; i++)
- 	{
-@@ -118,7 +135,7 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
- 				continue;
- 
- 			fz_try(ctx)
--				ui = populate_ui(ctx, desc, ui, o, depth+1, rbgroups, locked);
-+				fill = populate_ui(ctx, desc, fill, o, depth+1, rbgroups, locked);
- 			fz_always(ctx)
- 				pdf_unmark_obj(ctx, o);
- 			fz_catch(ctx)
-@@ -126,14 +143,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
- 
- 			continue;
- 		}
--		ui->depth = depth;
- 		if (pdf_is_string(ctx, o))
- 		{
-+			ui = get_ocg_ui(ctx, desc, fill++);
-+			ui->depth = depth;
- 			ui->ocg = -1;
- 			ui->name = pdf_to_str_buf(ctx, o);
- 			ui->button_flags = PDF_LAYER_UI_LABEL;
- 			ui->locked = 1;
--			ui++;
- 			continue;
- 		}
- 
-@@ -144,13 +161,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
- 		}
- 		if (j == desc->len)
- 			continue; /* OCG not found in main list! Just ignore it */
-+		ui = get_ocg_ui(ctx, desc, fill++);
-+		ui->depth = depth;
- 		ui->ocg = j;
- 		ui->name = pdf_dict_get_string(ctx, o, PDF_NAME(Name), NULL);
- 		ui->button_flags = pdf_array_contains(ctx, o, rbgroups) ? PDF_LAYER_UI_RADIOBOX : PDF_LAYER_UI_CHECKBOX;
- 		ui->locked = pdf_array_contains(ctx, o, locked);
--		ui++;
- 	}
--	return ui;
-+	return fill;
- }
- 
- static void
-@@ -188,7 +206,7 @@ load_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_obj *ocprops, pdf_obj *oc
- 	desc->ui = Memento_label(fz_calloc(ctx, count, sizeof(pdf_ocg_ui)), "pdf_ocg_ui");
- 	fz_try(ctx)
- 	{
--		(void)populate_ui(ctx, desc, desc->ui, order, 0, rbgroups, locked);
-+		desc->num_ui_entries = populate_ui(ctx, desc, 0, order, 0, rbgroups, locked);
- 	}
- 	fz_catch(ctx)
- 	{
diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
deleted file mode 100644
index d19f0593a119..000000000000
--- a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-From 32e4e8b4bcbacbf92af7c88337efae21986d9603 Mon Sep 17 00:00:00 2001
-From: Robin Watts <Robin.Watts@artifex.com>
-Date: Thu, 8 Oct 2020 18:10:28 +0100
-Subject: [PATCH] Bug 702958: Fix overflow in fz_clear_pixmap_with_value.
-
----
- source/fitz/pixmap.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
-index 66873d214..80d8bb62f 100644
---- a/source/fitz/pixmap.c
-+++ b/source/fitz/pixmap.c
-@@ -555,7 +555,8 @@ void
- fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
- {
- 	unsigned char *s;
--	int w, h, n, stride, len;
-+	int w, h, n;
-+	ptrdiff_t stride, len;
- 	int alpha = pix->alpha;
- 
- 	w = pix->w;
-@@ -572,7 +573,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
- 
- 	n = pix->n;
- 	stride = pix->stride;
--	len = w * n;
-+	len = (ptrdiff_t)w * n;
- 
- 	s = pix->samples;
- 	if (value == 255 || !alpha)
-@@ -584,7 +585,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
- 		}
- 		while (h--)
- 		{
--			memset(s, value, (unsigned int)len);
-+			memset(s, value, len);
- 			s += stride;
- 		}
- 	}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 9b60145824f7..dc110cc50e17 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 58795a335e3e..aed8ad34ca2a 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,4 +1,4 @@
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
-EBUILD gnatsymbolize-2021-r1.ebuild 750 BLAKE2B 59caf129b2316bef02062f4e1dc03c7a87a601c2a135764ae960df1d80f182ff6491a694b2e75b754d943ba9fbfe12a8878ddaf42ed2366a14d9e21612106689 SHA512 61e9ff9b4df47d4e402a624f4a6a22319ca8a60695740a180791b8e63a80976b175f249a8c9e4184572b6261b2daa78f25138c8ba212831855befa8f66c2ac97
+EBUILD gnatsymbolize-2021-r1.ebuild 768 BLAKE2B a5a54ce52373e0ff9abf921b08414a927553bc59a38a6ffe521536f0398d158b484af288f967abace4e6c24c3601292d063aa038989d6af98415bb46d7c6e45b SHA512 8bb59d69ba1fa6d62ec40965e0f14f4c3d45a466d9880116e6867fc574247771196b2eade6bd78acad088d8e4a2cbeedc9297d7f0a528616693d84b49a37391a
 EBUILD gnatsymbolize-2021.ebuild 737 BLAKE2B ac938e08632905c51af5b27d2a454a72f436a421bfa0fdb81572b9539ff87fecf7b1bf670b2b8997e438d0bae60d91c3b72e2603d9c2ade5c8b0d1dedbfee971 SHA512 e93a3831ffd788217617a1645c813f3b73a7f6a614a9d867a3251496e3a8174c763d679322dec510e6f2dbb2135f5208d588f7b150edf01ad6f3ff9363a6f9a8
 MISC metadata.xml 391 BLAKE2B d9e0444e176d262c87f289990d11122e4a06bd7f17fdf65d4e24fd7d6f09d1f36ba05c4f9896d8428e089ca2d85a8366f2e834139dd48c5a3626d2e9f4aa11a5 SHA512 fa7efd43d05a874d3b1733ded27ff6cbb245b9c03e301bef82d2962fc5ae7a585d2e49b49e9ceeecb92bbc8a08fe18cfe6a50a7db060b85a2ba54c65e1e5eda8
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild
index 60f9e67f7c3e..e73a9ec6fd93 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 S="${WORKDIR}"/${MYP}
 
 src_compile() {
-	gnatmake -v gnatsymbolize -cargs ${ADAFLAGS} || die
+	gnatmake -v gnatsymbolize -cargs ${ADAFLAGS} -largs ${LDFLAGS} || die
 }
 
 src_install() {
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 2c2d1c2c716b..32604c60dcc6 100644
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
diff --git a/dev-dotnet/dotnet-sdk-bin/Manifest b/dev-dotnet/dotnet-sdk-bin/Manifest
index 70581b7e8a8e..a68e2382e3d8 100644
--- a/dev-dotnet/dotnet-sdk-bin/Manifest
+++ b/dev-dotnet/dotnet-sdk-bin/Manifest
@@ -13,9 +13,9 @@ DIST dotnet-sdk-6.0.400-linux-x64.tar.gz 185123905 BLAKE2B 84a4df49516cf9e1185b5
 DIST dotnet-sdk-6.0.401-linux-arm.tar.gz 181483226 BLAKE2B 75be333749c8bfbdb93dd0524ad9cc79e97ca8b8eb5ef1c2a26593b10de9cd8d6d5f17035e14bbd7e65ad06dd4c6b30ea7363e45c985e356eb513220c7af698f SHA512 7d3c32f510a7298b8e4c32a95e7d3c9b0475d94510732a405163c7bff589ffda8964f2e9336d560bd1dc37461e6cb3da5809337a586da0288bdcc71496013ba0
 DIST dotnet-sdk-6.0.401-linux-arm64.tar.gz 179313972 BLAKE2B dac1b2b3e8fe79b3cb2f5da670dc7e27b0f673df41e2590f35e61353714364c323c96207e6ab4c89f0c9aa5172b09b555345650d1e9ec39c7e32440c1c70faaf SHA512 8c05f9e02e0a48fcc3e4534fa7225fe5b974c07f1a4788c46207e18e94031194e1c881e40452ee6c432764e92331c50ae47305d4aec5afa363fab3a8a6727cdf
 DIST dotnet-sdk-6.0.401-linux-x64.tar.gz 185736764 BLAKE2B 8a28e4bdcf897ea34fc31b1ddad2f8d8e1c5bcbf42513ddab8c102dff1a71458a0c553e28ada08e1a3b358ae1c0699e8632ddc7352d5ca0de34b1f23cbf6254c SHA512 6fce5f29e6cfc80da1df86d2de3a637108023397d275e0dcfa0b79ef36eb85c2c3433db467aa5d8fda7e32bc21205a126636b53d56c4eb4c547d9d3b2370cb31
-EBUILD dotnet-sdk-bin-3.1.422.ebuild 1551 BLAKE2B aacf0188f6177ef806df1d845bfb05c05b0e145b2c7f7e203bd067131d3efc352b49e5b823841d9c0c9a04abaad9ccda5f8db131485c2b5d76e5cbd7c6150653 SHA512 46b73df7a479d9cab52a570e1f9ba564680fb28ba3a76c0596cc3047218c7cb4215b190f221d1239ddb26de9a1fcffc629555df7702ec3d0fce6be90fd2d059f
-EBUILD dotnet-sdk-bin-3.1.423.ebuild 1551 BLAKE2B aacf0188f6177ef806df1d845bfb05c05b0e145b2c7f7e203bd067131d3efc352b49e5b823841d9c0c9a04abaad9ccda5f8db131485c2b5d76e5cbd7c6150653 SHA512 46b73df7a479d9cab52a570e1f9ba564680fb28ba3a76c0596cc3047218c7cb4215b190f221d1239ddb26de9a1fcffc629555df7702ec3d0fce6be90fd2d059f
-EBUILD dotnet-sdk-bin-5.0.408.ebuild 1606 BLAKE2B b286c3701d2af8a80b9753c6e3697fb05cac0d1524ae486d191a589c0e1a6b933fcab8148a879421dfd25ac1863ebe9639d32e2e32eaa1b3d71855f6c3e4faee SHA512 5b8a95b17f554a291c6d0774f8249f0e5235f66732693643109261b1b97fe266701333743341ab560bedd69fd1ace46c9b2e0cd42d033bddeb84c9efcb758b5b
-EBUILD dotnet-sdk-bin-6.0.400.ebuild 1902 BLAKE2B 19ceaa0eb67fa9410e4993b2cd904edd78a4fb10be5c33d3c0fb8ee403a62d0f69a7ce16ed07b59ecdf48cd9896a1e7e58b830f2c2cf7c6426dab10d7267a369 SHA512 18eb860435f01c0c9b8a2e96720fab9b7e69adf848c98502689cd837ba997df05d5440d94eeb47a4c81d362986ce1a742c5a1e7c3dc2194a5bdf02a176d41cf4
-EBUILD dotnet-sdk-bin-6.0.401.ebuild 1902 BLAKE2B 19ceaa0eb67fa9410e4993b2cd904edd78a4fb10be5c33d3c0fb8ee403a62d0f69a7ce16ed07b59ecdf48cd9896a1e7e58b830f2c2cf7c6426dab10d7267a369 SHA512 18eb860435f01c0c9b8a2e96720fab9b7e69adf848c98502689cd837ba997df05d5440d94eeb47a4c81d362986ce1a742c5a1e7c3dc2194a5bdf02a176d41cf4
+EBUILD dotnet-sdk-bin-3.1.422-r1.ebuild 1365 BLAKE2B 0b31aa04a123e9c532664c51bd0e4baa82f8f1f0705a96373a4ceee79d9686034d278f44831252810527b7c5368b543b06b02e91d4c6feed65456e3e8d74c754 SHA512 40aa04befccb61473b647e02393484d7c063b9a6f48aab69db5dcb13a9ce476fb2630a1d99c682e5f491ae65e6ea32cf551e7f17fb1420d42f4228763d6e975c
+EBUILD dotnet-sdk-bin-3.1.423-r1.ebuild 1365 BLAKE2B 0b31aa04a123e9c532664c51bd0e4baa82f8f1f0705a96373a4ceee79d9686034d278f44831252810527b7c5368b543b06b02e91d4c6feed65456e3e8d74c754 SHA512 40aa04befccb61473b647e02393484d7c063b9a6f48aab69db5dcb13a9ce476fb2630a1d99c682e5f491ae65e6ea32cf551e7f17fb1420d42f4228763d6e975c
+EBUILD dotnet-sdk-bin-5.0.408-r1.ebuild 1420 BLAKE2B 89aaf8aee35ee64fd668f80234b4752c028fba782639ed075e6598391127f11207189db1d4332709f5ffa7f489dc548a34342ec381b86f403daac1ae0e1ee493 SHA512 95b4037934b6ec29f630c598dfe6d9df174911efc6528370cfff03c1ee038afcc8dd6bfbba9c624bb1d02e0cb68c8d22bc636fd3768fa86dc336bf0ed0dffffc
+EBUILD dotnet-sdk-bin-6.0.400-r1.ebuild 1716 BLAKE2B b901f208c47a0e179d773aa8aff652e1d79fe1e6741972c31769b8dddb1f0af5ab30fa9f97ebef6ba1715507382cdd62315158bbcbe8d615fff2a028a2581684 SHA512 626a3e7e4fb867f5eef31352493a76e58d41b59e8bea6c4f8d3f050a88f668625e11b37bdb270fda2282503bd7a23cd70aad86de1201a754c07ba1a551ccadcc
+EBUILD dotnet-sdk-bin-6.0.401-r1.ebuild 1716 BLAKE2B b901f208c47a0e179d773aa8aff652e1d79fe1e6741972c31769b8dddb1f0af5ab30fa9f97ebef6ba1715507382cdd62315158bbcbe8d615fff2a028a2581684 SHA512 626a3e7e4fb867f5eef31352493a76e58d41b59e8bea6c4f8d3f050a88f668625e11b37bdb270fda2282503bd7a23cd70aad86de1201a754c07ba1a551ccadcc
 MISC metadata.xml 506 BLAKE2B 55557ab3b5268a5e2a2ec4ca0c0c0aabc0252fc46c73a6d17f07af3d48daa0a0943f4638d138bdf35d108d462dd0bec21571f354f8dc5e5e0d366ab83141ae6b SHA512 25bae232577cbcd584f68b76bb2764b874913e2bdb35f4b115ae7338b7d49c5e6ef9c049ddbbb97e609aea1bf18dfca1fca5941036da3a46d786f1f63c06e773
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.423.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.422-r1.ebuild
index 595560460cba..ca7f74f1a41d 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.423.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.422-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit optfeature
-
 MY_PV="${PV}"
 
 DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
@@ -25,6 +23,7 @@ QA_PREBUILT="*"
 RESTRICT+=" splitdebug"
 RDEPEND="
 	app-crypt/mit-krb5:0/0
+	dev-libs/icu
 	dev-util/lttng-ust:0
 	sys-libs/zlib:0/1
 	dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
@@ -48,9 +47,3 @@ src_install() {
 		doenvd "${T}/90${PN}-${SLOT}"
 	fi
 }
-
-pkg_postinst() {
-	# For bug #833281 Also, MS docs:
-	# https://docs.microsoft.com/en-us/dotnet/core/runtime-config/globalization
-	optfeature "globalization support" dev-libs/icu
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.422.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.423-r1.ebuild
index 595560460cba..ca7f74f1a41d 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.422.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.423-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit optfeature
-
 MY_PV="${PV}"
 
 DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
@@ -25,6 +23,7 @@ QA_PREBUILT="*"
 RESTRICT+=" splitdebug"
 RDEPEND="
 	app-crypt/mit-krb5:0/0
+	dev-libs/icu
 	dev-util/lttng-ust:0
 	sys-libs/zlib:0/1
 	dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
@@ -48,9 +47,3 @@ src_install() {
 		doenvd "${T}/90${PN}-${SLOT}"
 	fi
 }
-
-pkg_postinst() {
-	# For bug #833281 Also, MS docs:
-	# https://docs.microsoft.com/en-us/dotnet/core/runtime-config/globalization
-	optfeature "globalization support" dev-libs/icu
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.408.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.408-r1.ebuild
index 0a495504107e..3d26e751070c 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.408.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.408-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit optfeature
-
 MY_PV="${PV}"
 
 DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
@@ -25,6 +23,7 @@ QA_PREBUILT="*"
 RESTRICT+=" splitdebug"
 RDEPEND="
 	app-crypt/mit-krb5:0/0
+	dev-libs/icu
 	dev-util/lttng-ust:0
 	sys-libs/zlib:0/1
 	dotnet-symlink? (
@@ -51,9 +50,3 @@ src_install() {
 		doenvd "${T}/90${PN}-${SLOT}"
 	fi
 }
-
-pkg_postinst() {
-	# For bug #833281 Also, MS docs:
-	# https://docs.microsoft.com/en-us/dotnet/core/runtime-config/globalization
-	optfeature "globalization support" dev-libs/icu
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.400.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.400-r1.ebuild
index bfdeb499a7c5..462d299e4691 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.400.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.400-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit optfeature
-
 MY_PV="${PV}"
 
 DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
@@ -25,6 +23,7 @@ QA_PREBUILT="*"
 RESTRICT+=" splitdebug"
 RDEPEND="
 	app-crypt/mit-krb5:0/0
+	dev-libs/icu
 	dev-util/lttng-ust:0
 	sys-libs/zlib:0/1
 	dotnet-symlink? (
@@ -57,9 +56,3 @@ src_install() {
 		doenvd "${T}/90${PN}-${SLOT}"
 	fi
 }
-
-pkg_postinst() {
-	# For bug #833281 Also, MS docs:
-	# https://docs.microsoft.com/en-us/dotnet/core/runtime-config/globalization
-	optfeature "globalization support" dev-libs/icu
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.401.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.401-r1.ebuild
index bfdeb499a7c5..462d299e4691 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.401.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.401-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit optfeature
-
 MY_PV="${PV}"
 
 DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
@@ -25,6 +23,7 @@ QA_PREBUILT="*"
 RESTRICT+=" splitdebug"
 RDEPEND="
 	app-crypt/mit-krb5:0/0
+	dev-libs/icu
 	dev-util/lttng-ust:0
 	sys-libs/zlib:0/1
 	dotnet-symlink? (
@@ -57,9 +56,3 @@ src_install() {
 		doenvd "${T}/90${PN}-${SLOT}"
 	fi
 }
-
-pkg_postinst() {
-	# For bug #833281 Also, MS docs:
-	# https://docs.microsoft.com/en-us/dotnet/core/runtime-config/globalization
-	optfeature "globalization support" dev-libs/icu
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0c63489ec1e0..ba301060895d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 9728fa919f16..a2398568017a 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,5 +1,5 @@
 DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
 DIST objenesis-3.3.tar.gz 125400 BLAKE2B 36cff7cb5a2dca9a81f3ca07d56995f68d9c61c9d2b7caeac5f87bb13da02b0494053927e2221c776edef0bafb862f5c97dfc0e79cf991c6c970b5b9206a5aa3 SHA512 786fe0d2d1dba0f006d5218101578d8fd23616765f5cdb4df190d138fd10dd675b9189887c27a40b63f09ed5e1dac1324b2936c7ac24a655e6f63d53b9cd7c01
 EBUILD objenesis-3.2.ebuild 1209 BLAKE2B 5dd9a097b3bdf8b84af29c6f5944ddd9b338eb9138fe9f3f4605fb6acc33d1ba7553bf47d6a82b02ca75fb682c1079c8a62a2e3a3e11de6b196ed44347b89139 SHA512 30892a8275f87b6a2c3101d1391da7c1991f1e5110e427a519521af57d287ad632c0879c6ca869d54b00de643350443984da3352a932b21c7983e352b2cab614
-EBUILD objenesis-3.3.ebuild 1190 BLAKE2B 7fbb7967b635506c305571bd2856d0c06bc3b4a26d035eac299ea6a58568e01610af95007dca47dac2c1cae3ff54ae7a3967608603a93775fb9d951529aad51b SHA512 4c73392f558294f6a20b5d8e5c2da557df2343f8bafc6206d394943933506e997db30724356b75e6b94dab7f80e0a50a93bb98f6ac90a1383941b58114891c33
+EBUILD objenesis-3.3.ebuild 1188 BLAKE2B 3b4f16d740be4ff6e0bccf8195ad4e3ed505dfbfeab5a4190d7ad6dcde9d6454801efc9f8658e6a6ad8f9987bc57b585e25b4d76a5630de5f1a523cdf2769f10 SHA512 dcf4e04b834733c058c34e2da5eee0a65af32c746c8f97c32b826657fb516016043bd19780068d6b23b2e89aa5b196ffa56079282c8590e9ff7756551d886849
 MISC metadata.xml 386 BLAKE2B 1015a40cbff1c5726a54996b8e0387b287ad70fbe45f732f399f4ef90c1839f0bfd0531139d9a304232fd6a49decd4bf287f746993ee7a1258b8bd3b920f2483 SHA512 e293fd7928f753745c69bb0357cc8140574c632d9a35e353df7dbbbc524855db423ac0cfc505b7bef2f98875cf5c05ed1144251702a0b932b6e1630d4be7ec95
diff --git a/dev-java/objenesis/objenesis-3.3.ebuild b/dev-java/objenesis/objenesis-3.3.ebuild
index 535f9069dfd3..e1daaf6cdcb9 100644
--- a/dev-java/objenesis/objenesis-3.3.ebuild
+++ b/dev-java/objenesis/objenesis-3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/easymock/objenesis/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 4b10a60f7dbf..479ed934bc12 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/boogie/Manifest b/dev-lang/boogie/Manifest
index 5b094bb61706..a7366bbedcc7 100644
--- a/dev-lang/boogie/Manifest
+++ b/dev-lang/boogie/Manifest
@@ -1,4 +1,4 @@
 DIST boogie-2.15.8-deps.tar.xz 71100772 BLAKE2B 1249627710fe0cc08c640ac7fe5e518793d237291810dc2df5d26bae2a4fd0fec15f0529b6fb799231002881665c2b2cf66b3a6a88494c780e96e51d78086959 SHA512 ee8df5693264c6b6e925f966a85e312e2df80d121c6e81786e7672d1591cdab8a66601c7d740df9db9704330a82f5aa01982d758cc4d5f151838be41c4d0b76f
 DIST boogie-2.15.8.tar.gz 1548233 BLAKE2B cd3d46b6702eb9c16cdb94ae9776ee52bb142be57e3b0dfd014e59c2f3a98aec84d891544cbd239d773c49ac6bc0b3e1eb5e1eb5cda1f1a0b9aa029f0ee674f2 SHA512 5e214a6451b0ac6a33088797957661cdb35e7fc99f880935f0f1d9329975c11a0849f5ba6244e90f528e6cc31dc2fc83636506130f59464889bf04ecf6130990
-EBUILD boogie-2.15.8-r3.ebuild 2179 BLAKE2B 5285abd06ce14d3d7caabecb6a6375bfa1f7b42d6e2df233edd14ec4fed00fc7b294bdb780b7869ea6d437ffcd12a76863cfab7371c5fcd99142f0ae3ed1f719 SHA512 3c495cf46b6a6c5bdae68390a155a1ee52c529e0ef9c7eca8e1307cee16c7758c5d86c73e811e6dd7630dabe78c9c6e1f268d4f9c1a11c5e5b57559a255a8756
+EBUILD boogie-2.15.8-r4.ebuild 2162 BLAKE2B 47c62cb3cb42c1d3fc54d9862cf59d5e745592c97eda31ca7d7f7c431838b50ddd34aa7ab569db1d811a4bef0b87b2cc03f44e94f2672adf299cb4b94ae06c83 SHA512 9c02b41e1e1b9465866d0ae450ae577e1e6b45d4aae2525e41fa047fc223caee112203bbe0851b5c74016114c5f9976c1b4c3c488408dda760ebe994a7cc9b77
 MISC metadata.xml 1090 BLAKE2B 838630d17f9e2aa9d8d329f5f6da0e2f00636c3e01ceb02e10f06d3b53b722859818343c6a6936e1d2a495b9ec8d77b729f03dfbc0e017dace31116dccee4ff7 SHA512 e66f1077862a81efd0e311d6e2a2f0b4cd5fd650748c4232e3d70cbd982685bf03da616092929686589e115a4fe3ba2d52c420b416222ccae221469ca2d5face
diff --git a/dev-lang/boogie/boogie-2.15.8-r3.ebuild b/dev-lang/boogie/boogie-2.15.8-r4.ebuild
index 1b6c0b18edd5..ce1ace397460 100644
--- a/dev-lang/boogie/boogie-2.15.8-r3.ebuild
+++ b/dev-lang/boogie/boogie-2.15.8-r4.ebuild
@@ -20,10 +20,7 @@ KEYWORDS="~amd64"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	dev-libs/icu
-	virtual/dotnet-sdk:${DOTNET_COMPAT}
-"
+BDEPEND="virtual/dotnet-sdk:${DOTNET_COMPAT}"
 RDEPEND="
 	${BDEPEND}
 	sci-mathematics/z3
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 3108ebd818ec..7fa6b8eefc95 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -13,7 +13,7 @@ DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 79683138873b236d8329396
 DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
-EBUILD gnat-gpl-2020.ebuild 3828 BLAKE2B b0b04987c3cd4cf49b6f3d8ec61a1ed84d8cf422149bbc38c2a20e9d0e9c3ee2a05fe37e45cf992caf3b3bb954a30c1eb45ad9b61fb5b6ae97efb4a4382248f6 SHA512 c84506eca5fd33270ca19141a80f921c04817f8dd8694e57b6f43ba12c8f6b9535272828339474ac1d4b508936ca52cb167c754410210cfa7d21c1c7b64157a2
-EBUILD gnat-gpl-2021-r1.ebuild 3997 BLAKE2B 3574dfdfb89d860cb42becccb479df5aff27b0de7005137b119f4ca5fd858c94ea11c723ad177765f2161b7486d6a57a4d8f73567d2a57add3ceb185add2d17b SHA512 3d59a0bfba9a3260c6ff0d9ea6061a45a6e8b2c9cc1559781d45d2f5034de05f652234691531ec80f979c577f48ed44ef4758f73d28083dbaeac1782046fb71e
-EBUILD gnat-gpl-2021-r4.ebuild 3961 BLAKE2B 9c5b826c4123210d4cbc4c793ff5baa3b8178c5fdbfa8739a1de03d7451e4bc1062972b84804070718cc7f6ff0d3352820b3ccebcb6cf85bd3519430a5d778d3 SHA512 640e2e5723cff3b9ef5ade327c0d8b853c78e602dcdc06f67e28c871438e35849053f3a8ef564c60d365a0a8a10a014bde53f9a3d435b2947ff0ef58f7948585
+EBUILD gnat-gpl-2020.ebuild 3840 BLAKE2B 82c2560e8b058805ce38780067334a8930bd5601f242d58ebca6b2e661796dccf5de0c306e66da1561ba9e0f38b3184da7e95399e40622ddd36985eed4569412 SHA512 971629f9003934c9bf018dd7d41293d395c86f3cd3dfe54bc007392a66e3ee3b1a50c57bf850f5e667509f99a9e5c063cf77ed5b74dca47787ba8fd2ecd73c28
+EBUILD gnat-gpl-2021-r1.ebuild 3963 BLAKE2B 13efe1a5e0196fe4af7b1a313bc2240be092c5bd772a99f8900473dc90a78e5c88b55a82a2fe86b138e5d1261ff0ed27b42fef4adc539ad7b3d5706a5d31a17f SHA512 b5b29e236535c4e5f53cd585ad13542e06875cc50eeb184fcc1997e055567efecefd1712c9037d50bafc0d0568ef727b5750aed93961b61e9b2efbdfa2806316
+EBUILD gnat-gpl-2021-r4.ebuild 3973 BLAKE2B b9db2268a33fe4ad67905ea0a5ca2d2210ad38b9633d5b537647f823a54c3bbc6de9e916c2f8fcc13febf906438bbb7ca8cdcb1cb06b70c46d1bd500ce14327c SHA512 b4d032d52dfa393cef113748beec4464d9833d6419260af711eb67e88a17342c0cb4b84f47a36dccdafae03a186123eb6627e9cc73c91d41974df99930bd1d6d
 MISC metadata.xml 1960 BLAKE2B e06642a8ae69d163bd2450a4dbf2350399becc0fa933780cbf1378721ec127b033cb547c7aff22d4b89724aefe933c7c0eaac55eab4a223f45d138006dd3492e SHA512 81c3ceafdc0a4d73427d6b12c1bfa41d647e8c788e71e1de09e79de4795573e35e403fd03b981beb350a6e9b55b44fd0d8a2f7279e83c23273fc150a126f2b07
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
index 7c3e1675fbdc..efc7ef0e3532 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -103,12 +103,12 @@ src_prepare() {
 		GNATLS="${gnatpath}/${GNATLS}"
 	fi
 	mkdir bin || die
-	ln -s $(which ${GCC}) bin/gcc || die
-	ln -s $(which ${CXX}) bin/g++ || die
-	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
-	ln -s $(which ${GNATBIND}) bin/gnatbind || die
-	ln -s $(which ${GNATLINK}) bin/gnatlink || die
-	ln -s $(which ${GNATLS}) bin/gnatls || die
+	ln -s $(type -P ${GCC}) bin/gcc || die
+	ln -s $(type -P ${CXX}) bin/g++ || die
+	ln -s $(type -P ${GNATMAKE}) bin/gnatmake || die
+	ln -s $(type -P ${GNATBIND}) bin/gnatbind || die
+	ln -s $(type -P ${GNATLINK}) bin/gnatlink || die
+	ln -s $(type -P ${GNATLS}) bin/gnatls || die
 
 	cd ..
 	mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
index 02da8f27ec3a..7e9e65beb91e 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
@@ -45,7 +45,6 @@ KEYWORDS="amd64 x86"
 IUSE="+ada +bootstrap"
 RESTRICT="test"
 
-RDEPEND="!~sys-devel/gcc-${TOOLCHAIN_GCC_PV}"
 BDEPEND=sys-devel/binutils
 
 S="${WORKDIR}"/${MYP}
@@ -106,12 +105,12 @@ src_prepare() {
 		GNATLS="${gnatpath}/${GNATLS}"
 	fi
 	mkdir bin || die
-	ln -s $(which ${GCC}) bin/gcc || die
-	ln -s $(which ${CXX}) bin/g++ || die
-	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
-	ln -s $(which ${GNATBIND}) bin/gnatbind || die
-	ln -s $(which ${GNATLINK}) bin/gnatlink || die
-	ln -s $(which ${GNATLS}) bin/gnatls || die
+	ln -s $(type -P ${GCC}) bin/gcc || die
+	ln -s $(type -P ${CXX}) bin/g++ || die
+	ln -s $(type -P ${GNATMAKE}) bin/gnatmake || die
+	ln -s $(type -P ${GNATBIND}) bin/gnatbind || die
+	ln -s $(type -P ${GNATLINK}) bin/gnatlink || die
+	ln -s $(type -P ${GNATLS}) bin/gnatls || die
 
 	cd ..
 	mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
index 1d550e0fd45b..3634ffe8e48e 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
@@ -103,12 +103,12 @@ src_prepare() {
 		GNATLS="${gnatpath}/${GNATLS}"
 	fi
 	mkdir bin || die
-	ln -s $(which ${GCC}) bin/gcc || die
-	ln -s $(which ${CXX}) bin/g++ || die
-	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
-	ln -s $(which ${GNATBIND}) bin/gnatbind || die
-	ln -s $(which ${GNATLINK}) bin/gnatlink || die
-	ln -s $(which ${GNATLS}) bin/gnatls || die
+	ln -s $(type -P ${GCC}) bin/gcc || die
+	ln -s $(type -P ${CXX}) bin/g++ || die
+	ln -s $(type -P ${GNATMAKE}) bin/gnatmake || die
+	ln -s $(type -P ${GNATBIND}) bin/gnatbind || die
+	ln -s $(type -P ${GNATLINK}) bin/gnatlink || die
+	ln -s $(type -P ${GNATLS}) bin/gnatls || die
 
 	cd ..
 	mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 11fff93db595..6b0e98d86bce 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index d125663b5736..e0f5ca36a060 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -3,8 +3,8 @@ DIST gjs-1.64.5.tar.xz 422548 BLAKE2B dcc0b7327cbc6a1108be031c8807e61ebd3c839291
 DIST gjs-1.72.1.tar.xz 620248 BLAKE2B 945b988fdb8c9fc01ec73c8f10b7e5ba9db3ee6dabee65d574b42b7cc9421a0c679f15d565a5e538f6493ed58dc4f9503698b8e3c554704338225d7a748b9594 SHA512 dbceb8651e248ace064d9338d1b3ee1ec0ec835843eb617925b09d77808a71274023d7ad621ed638ff47b93e1fa46e7a349342e555dd6043dc97b81d36bf34e6
 DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
 DIST gjs-1.74.0.tar.xz 638064 BLAKE2B d44f323aef9b696c7dab53fb46d6bbf142f83636bff81fe68bd30f1f897a778836d7a388c946cb86e84df15b3908d8ff14f0d994854eb2dce7af2c4e54da299b SHA512 a17947664a2bb83363ec564dcb5e619f241d0b547512042f2c0e49fbbc8ca4217b90e6b22bc2e4004e8f27e013f8520674a493f7cf3b808437b855eee3eb0408
-EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B ba36f6e0485dc507cba57a163eb835d5857e00e6f9dc46e6659bdd4e3b35965f10d8808c3a0220e7369f29c3c0552351ebdff4d590932bf916a11b2ae26ab8bf SHA512 d2be5b242e3249e7a718f7ea595ab3b44a83645f553d7ad42cc5a2b766b96a335b86f182a718fc1544e0817ade4b2d6229a0b0a41f9c4ab5f5ab0af49fc96bde
-EBUILD gjs-1.72.1.ebuild 1925 BLAKE2B cb5519e7e59c873f00cd8a76467121c06aa61901f148e88bbfad3318062cf61c42175e21c0ec582d2bd7b8b20c5e94069c0558165698e7f7457c8b0eaa1f1fa3 SHA512 e42397dd717a6c59cdf943447bc66c3e9e2c2afb3e9f2b39a18900fdffec6e596c42c55d10ca26d6f0f16c9fc1b07655e5c61d2c5dcce44e76d2b90bee2fd4e3
-EBUILD gjs-1.72.2.ebuild 1925 BLAKE2B cb5519e7e59c873f00cd8a76467121c06aa61901f148e88bbfad3318062cf61c42175e21c0ec582d2bd7b8b20c5e94069c0558165698e7f7457c8b0eaa1f1fa3 SHA512 e42397dd717a6c59cdf943447bc66c3e9e2c2afb3e9f2b39a18900fdffec6e596c42c55d10ca26d6f0f16c9fc1b07655e5c61d2c5dcce44e76d2b90bee2fd4e3
-EBUILD gjs-1.74.0.ebuild 1969 BLAKE2B ed5e63e07e527c9f3429411355b2051945cfde763795d63317ba0a41672d481580b085fa550e0f4f770d8af7f95deb92654d40870027b188ffc2d07e90bf7563 SHA512 0b40cf59ca8e90ae1af8d4c54219626eaccfcf03bb1173b74593591277c49cbf66389736d5d67a6a54c44448a60f02704a2bef2b7948b8b9bb31b53c0ae4d7af
+EBUILD gjs-1.64.5.ebuild 1178 BLAKE2B 7a7f9e350fc00cfd2e57769e2d2fb73c7a8373d2d01b9d7832f8a44cfdd11e230e3f9d4b87c412114583b5dc611f5c601eaca8094c32b0bfd80db6c5ff30ed4a SHA512 0c4d1ae24e46994e913d22196eca70d5bdc42645d6bee2fdf3864350edbe38d07b7d55829a9b74d0c93f1304d67d869aad9160dc11f67f7dac282c5305d10bca
+EBUILD gjs-1.72.1.ebuild 1921 BLAKE2B a7432f0110bc855819bf1a2321f315e24b6add6fc30e79d1d2199ad4e2ed3eb8c0cc29a2bbefd1df957ff5b3b747b2effa7c9dedb0f208a269ae7863242dfa47 SHA512 bd74bf37718eedde8b358d6e753d283e072225213a2ec2886322fc7cbf0d578aa672baf9ef2e2d67de842cd5f6d6b67549e7866e06e964ae172194a7d0e68d4f
+EBUILD gjs-1.72.2.ebuild 1921 BLAKE2B a7432f0110bc855819bf1a2321f315e24b6add6fc30e79d1d2199ad4e2ed3eb8c0cc29a2bbefd1df957ff5b3b747b2effa7c9dedb0f208a269ae7863242dfa47 SHA512 bd74bf37718eedde8b358d6e753d283e072225213a2ec2886322fc7cbf0d578aa672baf9ef2e2d67de842cd5f6d6b67549e7866e06e964ae172194a7d0e68d4f
+EBUILD gjs-1.74.0.ebuild 1961 BLAKE2B 95630274a47d70958cf1ca7cd850a29ee256dff73c04ea1ab06c97786c714bafdd63c8e7f206dcc3b84776784ca6f61d97123cfcceab306fcc35df0a2ee3d46b SHA512 8a03626e071db4d1998301f33ab4fc6658b7cf2784450f9713fc961ed38bb435157705cec1cd9a9bd45b89cbd622a858d580abcd14399ed7bf98153a94826cdf
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.64.5.ebuild b/dev-libs/gjs/gjs-1.64.5.ebuild
index 60973ef2fa78..c9acc67c8466 100644
--- a/dev-libs/gjs/gjs-1.64.5.ebuild
+++ b/dev-libs/gjs/gjs-1.64.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="+cairo examples gtk readline +sysprof test"
+IUSE="+cairo examples readline +sysprof test"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 sparc x86"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gjs/gjs-1.72.1.ebuild b/dev-libs/gjs/gjs-1.72.1.ebuild
index cc09c1592110..1bc9ac221ed6 100644
--- a/dev-libs/gjs/gjs-1.72.1.ebuild
+++ b/dev-libs/gjs/gjs-1.72.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
+IUSE="+cairo examples readline sysprof test"
 KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gjs/gjs-1.72.2.ebuild b/dev-libs/gjs/gjs-1.72.2.ebuild
index cc09c1592110..1bc9ac221ed6 100644
--- a/dev-libs/gjs/gjs-1.72.2.ebuild
+++ b/dev-libs/gjs/gjs-1.72.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
+IUSE="+cairo examples readline sysprof test"
 KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gjs/gjs-1.74.0.ebuild b/dev-libs/gjs/gjs-1.74.0.ebuild
index dda2b9c1dcb1..fc6216a63210 100644
--- a/dev-libs/gjs/gjs-1.74.0.ebuild
+++ b/dev-libs/gjs/gjs-1.74.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
+IUSE="+cairo examples readline sysprof test"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 RESTRICT="!test? ( test )"
 
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	>=dev-libs/gobject-introspection-1.66.1:=
 	>=dev-lang/spidermonkey-102.2.0:102
-	cairo? ( x11-libs/cairo[X,glib,svg] )
+	cairo? ( x11-libs/cairo[X,glib] )
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 60ba605e9dbd..75714a9ab8a4 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,8 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.7.tar.gz 815838 BLAKE2B 21284f5128c9264b751011b1d68c6baf553037612cab39cc339920091ae42980f6c3920f5b339d4cba31a40b190fa73d779f45dcc30b78e866708c3178ac6699 SHA512 dd763bf89d8356aa00805817af7029ee77452a9210b6aded16ac1434f233fbba9b41014ab55a076773f50da6d16e1cffae50e2a23d1c4b336df9cc88c05ede56
 DIST leatherman-1.12.8.tar.gz 815817 BLAKE2B b0844527a470c0e54983d49abc84a7331a07f3cac76919f56e58a01d60b794e422f3ef8342e046c483a83c428d2c80ff8e8d6b71375f45ddb03a5721e63c7aef SHA512 c6096a7c0e95fb43c6998f26e8f28157f46b78af4eaf2caaa1caae832d2f23aa7591e3a29a17f24bc9b993421645d37d44249fd8cae15a3d18b40d614acd23ad
+DIST leatherman-1.12.9.tar.gz 816107 BLAKE2B 1c2e50767585a30da40fdacde0aa8655cefc2a41cadd24a7689be5da0afcbe8627293d37780442873907996f01401b46340a3d7be5d9b2a65b2f87191daca6c3 SHA512 e69f2b0c04a1cbd20e097abcc020e7b27fb74f168207fcbcffce9fd0edd1760acc75d5c5f645d3a798f106e129ce73e512f0c11699733475b290dfc876de0565
 EBUILD leatherman-1.12.7.ebuild 1265 BLAKE2B fd240363bc78ddc11c796b2939ad4a4e3b9860bf4f75a0e78a8db284b90bd7d0803595758088b251a05a103a2f00e520f7c82708325b8a32bdd66b28f24b0367 SHA512 60a39204ad1f5a934407532f456008265b39299f1c0d29bb373a99fa279457de4f74cc9841c20fe13848918e4add4e8f6612fd42aa2271626a5aa6392b90134b
 EBUILD leatherman-1.12.8.ebuild 1265 BLAKE2B fd240363bc78ddc11c796b2939ad4a4e3b9860bf4f75a0e78a8db284b90bd7d0803595758088b251a05a103a2f00e520f7c82708325b8a32bdd66b28f24b0367 SHA512 60a39204ad1f5a934407532f456008265b39299f1c0d29bb373a99fa279457de4f74cc9841c20fe13848918e4add4e8f6612fd42aa2271626a5aa6392b90134b
+EBUILD leatherman-1.12.9.ebuild 1270 BLAKE2B 01196abf2d0247e7517f6bb34042b248c0cd04a714d49f1594379faa6a81002264e79d33777ae350d40ee93d392b5aa8e93a978c22a07daeb83322b118be65c3 SHA512 89dc7af761f02124d83d9b143e7faf4e03a5697a7902bbe9b7d5e6f289ecf0b2803381d52f44968203bf95feb644387873a8d80e6241c5956c4917feb49029e6
 MISC metadata.xml 341 BLAKE2B 63e2c407d9e7f5dfcf324cba650e46ae440f9b365645b5bb51f943c3d003ce9a94522d512667879b1d4a22ba71b9ddce560606e52f5b6cdb84677d2a4efbba6e SHA512 5b2e4f0b7aa914686915312fe957f40ece7701168775e160730c76975af52530ad2d95595ab8c6b410470a0cd2ea11e3bdf2a9fd78d0926a6cbcc2628ff275d2
diff --git a/dev-libs/leatherman/leatherman-1.12.9.ebuild b/dev-libs/leatherman/leatherman-1.12.9.ebuild
new file mode 100644
index 000000000000..bfe232d5a27e
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+
+RDEPEND="dev-libs/boost:=[nls]
+	net-misc/curl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/portage-sandbox-test-fix.patch
+	"${FILESDIR}"/1.12.2-shared_nowide.patch
+)
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DLEATHERMAN_ENABLE_TESTING=$(usex test)
+		# We depend on Boost with nls, so this is always true
+		-DLEATHERMAN_USE_ICU=ON
+
+		-DLEATHERMAN_SHARED=$(usex !static-libs)
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test || die
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 72cf43b3578a..402343564e91 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -8,14 +8,17 @@ DIST simdjson-1.1.0.tar.gz 1555845 BLAKE2B 6dfd4e938b9f1f6a6314f39929b74a7e822fb
 DIST simdjson-2.0.4.gh.tar.gz 1612055 BLAKE2B af60f4ae6780eb4068ac85c2d6784539b14fad6b7871c091f2ec3dc4f8cc9add8510f4d92a8db6ea305a1c2cc6919c8f8604d31d4e939677f3ed121b53891c24 SHA512 5d993939aece8555dc7fc5d63be14103af4ca164fb0cd53ac96578ed8a9fac61f974c247544ad007710c7a710bfaea7ad94098a143c713097237cd47c7792463
 DIST simdjson-2.1.0.gh.tar.gz 1618798 BLAKE2B 019e04ae5c5d0e43bf81734edb72d969d95fa4325f2e9aa51258d71587a6d71e4f26edd9beb2797fbf420ee4d7434985e7d960943dacedfab3a6afe616ca20b9 SHA512 6689349195ac4f0f94d47915f90b69663b6a010523fcf58fbe8bb3815db946c65208104c6f1e5d97e42cc1e1b883e5488c059df0afcc7f6e648e2ab3eb97af13
 DIST simdjson-2.2.2.gh.tar.gz 1623231 BLAKE2B 1caea4b5224194770af5b43c82110faf9fd17450935af67e3f9e6d3da164ffd3d40a4cca49a4d1b3007549835ecb838b6788e97059548dfa86b206ce240bdbd9 SHA512 a11698491d12aac3b92dae0fd994d0809910cf5c88550058c84035aa3bec02ab4541ab99e12db6605581f6ba61d7951a2cf3988fc20a467f4993f35d24cf2a76
+DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
 DIST simdjson-data-1.0.2.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-1.1.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-2.0.4.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-2.1.0.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-2.2.2.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
+DIST simdjson-data-3.0.0.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-1.0.2.ebuild 1835 BLAKE2B a6aed9d075d74a17c1e27a94eef4f83414705e797987445d8000565989730f1accbf832ca531f05ba8fe7feb388b1ce2abcc250ff3286cda5489c76fa56f3d4b SHA512 c20ff75ec5887825b30564f0e6cd48bc533bcdff290cd278b09b87a53cbd5685b066b87c0bdc148959f6424feceaa9910b975f52875e450bb32f484ec17986d9
 EBUILD simdjson-1.1.0.ebuild 1836 BLAKE2B 4138055e3875f3fbe8179bf6a28763f269f1e91bb72ded3ace4a7b158fe2e701e0ae7b6de4e615085d7348fa9951d3eb09cf16ec6a103279c29812d3ebbab536 SHA512 b02ed933a900e8a43a9e9bf31c50367dae27e40dce1da1f6532607a3154b53e197cb0d30897f0e40b08480afd7c4ae29531b463d5a1cb60b49f320858d4167db
 EBUILD simdjson-2.0.4.ebuild 1842 BLAKE2B f7ddb79888fc5224565e6e58203db7c22f444732d159ca55efd6a0af4617f23db7e8a7ea0eebf828ab2285dc4a6ce9b030238bcaa10c7c162313a3b0ccc21e7c SHA512 c42d70b050e1819f0e735bd06a7cf306fb3bd57328499a573f69775a362089c6eb214d5171f385384e6c66bbd6cc6df02c70c8b553d8aae322db127267a2a4c3
 EBUILD simdjson-2.1.0-r1.ebuild 1843 BLAKE2B e7048ec0f2ecee5481551faf3275a0b02ede89cfdce97d466b2ee48c2bde561127ab2c0a0c33e76fb7157d961f616df6ef38e1f16bb3b5e0cb71f7cfc0255d40 SHA512 5591ea1c18f56d6341ed60c30f644b23d17013e7004da0f270b3cda5f2709911978e9318eb6e135559152aa61b834bdb09308cd5d179e318dfbab36c8aa5a0c9
 EBUILD simdjson-2.2.2.ebuild 1944 BLAKE2B 4f677e417e9556d5bd7044dd22e844ee9192ed69890800c2c957df44fd17b693c9ce45c6550525cb6528becd975064d444854cb38c4b7b280a024fc9349e5ef4 SHA512 5d04913b39bfc174ea856156816cafc7601cde569edb4d2404a9bf1b1ef09b7b2d4161e2ff6b006ae04381bc4af6b7878e85cceddebf4b18d79fb38cc42e0d6c
+EBUILD simdjson-3.0.0.ebuild 1963 BLAKE2B d9521b53f395cd8728105223383fd206075e33f37d29fa0f3ccafd3245443f982e0dca9e4250674f136f7776c4e6d20b884ee431b490bd30dcafe67298997536 SHA512 ae8d7b843690baee5bad72afd498eaacc72d14e298cc8ff6dae9e9c56fa16606a88a84419595a42ecdd34a65de658e8166b73ca69b854021e11c2097f4b772a7
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/simdjson-3.0.0.ebuild b/dev-libs/simdjson/simdjson-3.0.0.ebuild
new file mode 100644
index 000000000000..756653fa008a
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-3.0.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+	virtual/pkgconfig
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-1.0.0-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	fi
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+			-DSIMDJSON_TOOLS=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1f6b0e0c1372..616dd0ea7e39 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/click-didyoumean/Manifest b/dev-python/click-didyoumean/Manifest
new file mode 100644
index 000000000000..42c7d2c2675e
--- /dev/null
+++ b/dev-python/click-didyoumean/Manifest
@@ -0,0 +1,3 @@
+DIST click-didyoumean-0.3.0.gh.tar.gz 309301 BLAKE2B 2b667b5e94dd690e5b7a2e96b83197f52e201b002a32fff4a8dbb4bd5497d5b816b40d9da98729821e1d17a795a3776c1553a746aa4c4144cf7fe6540768e1ca SHA512 4927ee392f27950c3f7ef5e0f1d5a5e2421172f3e9d34ec76986c9c7ea698cfa1981678a06fb8682577d6ed04c242c42bdd1d796d7623a1c99dfdbdb61c80fca
+EBUILD click-didyoumean-0.3.0.ebuild 599 BLAKE2B 2f88a8a95a44074d6948b24e196b73e44abddb9f57582819c0ea1b137b74cc2fd7b253594102adc5b935903d67e84ad182316b9be2b55394ca1c4263e12b0a6e SHA512 3ff7cdd10480bc6625678f563aba2a5cdf4840470b60759488b0ce8a289ce5885579cf417be6081f99bfd75a0cce778205c7282d74b80d96dfc4e90f2cbcbb2c
+MISC metadata.xml 414 BLAKE2B 576a2c062532711acb20510ba067e6daf75731007c62afc0bc59cddbe671f9f52bf43efaa737364dc779b6cc6de1ba47b98db4b3a101d9c5e3b6a83503cf31a9 SHA512 a49599c15a4051756421fecab41dd723907e5b988e6438426f8c5633d69abd46644a56d45997f81b564c08dcb6a3dd505a045872fa3ddae0f05e3e2300ddb157
diff --git a/dev-python/click-didyoumean/click-didyoumean-0.3.0.ebuild b/dev-python/click-didyoumean/click-didyoumean-0.3.0.ebuild
new file mode 100644
index 000000000000..7b69e0d713ed
--- /dev/null
+++ b/dev-python/click-didyoumean/click-didyoumean-0.3.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=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Enable git-like did-you-mean feature in click"
+HOMEPAGE="
+	https://github.com/click-contrib/click-didyoumean/
+	https://pypi.org/project/click-didyoumean/
+"
+SRC_URI="
+	https://github.com/click-contrib/click-didyoumean/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/click-7[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/click-didyoumean/metadata.xml b/dev-python/click-didyoumean/metadata.xml
new file mode 100644
index 000000000000..1a9b0c6e2e93
--- /dev/null
+++ b/dev-python/click-didyoumean/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">click-contrib/click-didyoumean</remote-id>
+		<remote-id type="pypi">click-didyoumean</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index 9cde4b65f905..de9e5e77ecc8 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,3 +1,3 @@
 DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
-EBUILD ensurepip-pip-22.2.2.ebuild 655 BLAKE2B 64434b2c338968a1cd0ad09a1f0b84010b51b5cf14a2d97ee1d97bd560150f583f122d717127700aa30623a250afb0b5634f7e9190a658252fdb0bd03c1d14c2 SHA512 015563286020fda1f8a80b09f31ac511cc21df62102f582f887f46ff339aeaf4b3717e684302631a0d9a3a16818421af6a905af75512bf53eb37e776ebf59a2f
+EBUILD ensurepip-pip-22.2.2.ebuild 654 BLAKE2B f18d5964a7314be76d7445f5187493d135bab4b7d8a26326b044ab4e0fb136373c27f46d3132d08de7cf53b475cfd4d9f3a12f1ba943344a9d39b388633f9dd2 SHA512 0e3db321efe3784abdab74e682a479ee0f5bd5681c6ea36e7a1c8caa20adfcf1a090e8c5bbfb81cd11ea3972321162f425ef62b7e06ec876eb03cde028ef389c
 MISC metadata.xml 309 BLAKE2B 197e5620aab85ff590270ae6838c9188cd699943af4c9c3eeb7de92c2e9390c082eec603e63bc2bba39477586f19e58da2e5fe2d5ffe9b59b87ae5386c939df1 SHA512 c678bc8fb62f6e6850939ebff56962503bb03393572cfff7e5f7d38e8cf5ca71d8e38e402355c5f963fb718eed24bca463d7c63fede5cbb550f6f32a9c06af9e
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
index 6ca917f08b4b..f502d3d7b09b 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index ad1f4f570d88..f65ac7bd7239 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,9 +1,5 @@
-DIST setuptools-65.0.2-py3-none-any.whl 1233332 BLAKE2B 0c0d0db73452d15947097f3d453f01bb42ef150b50122b7a1f39212f663064284bc313a04c3dbe99e8da7e614d72a963d6c9f0c8f486f5d84131a06718b288c8 SHA512 11d9975468166bf7db9a9da44d893a67daacc5f309da1b521278a95a33fa2b3574cae10840c9943de54bf5d411e54697f91b62a3bfb5a6a3bc69b804af2a1365
-DIST setuptools-65.1.0-py3-none-any.whl 1232689 BLAKE2B db8f85b99b1d47af55d484d77ecafe5122abe9ab8dcec565659bb91c16aa26513c00d8684ca3b7b57e629d512b42273188a00ee0a0958bba5097ce150869609f SHA512 1072a826964ec3413c5bcd3f930a2f314b87b0b77714ddc948573841fbb871a898843211beaff0bcc5e003fcaab678de5d2b9a3a9fa864beced1bf2af282d048
 DIST setuptools-65.2.0-py3-none-any.whl 1232422 BLAKE2B 049fbccec71e15ed01b5e07f5d60589c662d012e4fe27c6eb8fbe3b62692bb63d891c9cf4253fe74b5a5803db39f3e5194f8481e5a3555493e9f18bd6985b35d SHA512 e0fc48a3ebe2022783c2f56d85d8ad5e17bd0f5f2caefc5e3ac6eb4ddf1464854ad9039c62a55e72ca6b0387e7f874b15b7a0df4acbf6153a51cb8e8146bd93d
 DIST setuptools-65.4.1-py3-none-any.whl 1232518 BLAKE2B 545caa5f7c551090e3dcb71c388477c4aad8aaee1dbf4a7f7fc08f27a296a81a055310b41c3d4af7cb3cf375c5ab465fec29ef3e29456281f56b7df544dd0eca SHA512 c0bc3f5f3b7c8a8b83df4d12f5f99d41ea910220abc16e8b93e3b533dc8d665802608c447e8c1eb070c19c24b1baa83faf2ac42488f95808ed585c169afadd58
-EBUILD ensurepip-setuptools-65.0.2.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
-EBUILD ensurepip-setuptools-65.1.0.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
-EBUILD ensurepip-setuptools-65.2.0.ebuild 620 BLAKE2B cdb59a7448ad7ba64fe903fe3f8cdf7f697c5e36d225557b1f656c1e16f54d12a778ef2ecabb92bfe1015f785ff62ed6a431294cbcf316dd24364f46baa11e2e SHA512 a924f4bccd7ef3d613a0ed51443b9eed6f3b2aa432ccc428c12661d150e3cb937cb9340f956920878b0b27a5f65e0220de7ca252ff008504020c02a4f2438b71
+EBUILD ensurepip-setuptools-65.2.0.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
 EBUILD ensurepip-setuptools-65.4.1.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.0.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.0.2.ebuild
deleted file mode 100644
index 96c75c915768..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.1.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.1.0.ebuild
deleted file mode 100644
index 96c75c915768..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
index ab1e43cc86ea..4dc09f674370 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index ea8a41888dd7..e097dc22ca11 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,7 +1,2 @@
-DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
-DIST setuptools-63.4.3-py3-none-any.whl 1230380 BLAKE2B e8959efcfdd53e163a49605f4abada5b3571a6511b5859aa73546ad317255fac03b5a38bfc7945cf10cc589f692a7a44de0a12b3d8107782ff6fcd80d0f521b6 SHA512 0c1df89ed0d6bfb368eb8ef211663de5d5fdefc89bb43e23bd639e18b5362d34b90c4be3212c64cda7308109e626991410204c761b949a0f04ae8fe1f86056a5
-DIST setuptools-64.0.3-py3-none-any.whl 1247789 BLAKE2B 60d7917c7c3d467ba8112ac596fb8558c259b7c1e39cf956694e4b0238bbcc5f2ad64aa3234f94614f9f05dcd67968428f2660ecec1de86b46be1f70d9df82e3 SHA512 081b9c024e469c976978cd60ce2e6c5019ff275035b6807629755fc1560a19892e37fd0ee81ff11b28190e861d732d69e08ea9d928f1910cd4e0db957ae6fcc8
-EBUILD ensurepip-wheels-100.ebuild 418 BLAKE2B 5b1e8e94eb9c4226c1434f22a545741d64146486c51a445e90f0dea3d59ad8902c11331595afb88114e1418c6e13944fc94b22f1f74dc7a62a990bc6ae8c762a SHA512 ec81ee8669e78b74d57c3e5e7e464a475e68da6643e418afdc4b2bf2025395d1b55dd94cb5e3a990cde4f3ab8bd892402fb8a9a2f965b0018981615f16f96d74
-EBUILD ensurepip-wheels-63.4.3.22.2.2.ebuild 840 BLAKE2B 1243e37a93ffdd939c1aa55cb0926e111e6fd5b6e6011e81b3006734c0f73d35d6f4c1274995a4227cc8868f334eb30b8faab03d69fb2f8b25af0c6f60c80a38 SHA512 564fbb4336c4e46dbd0472801653c53c6af54aa72cf047f72a04ed7379474eefa49975d1e5ee231e3d0832bf22b65ad169acfea125abcc8dbc6ca7e4802a7e30
-EBUILD ensurepip-wheels-64.0.3.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
+EBUILD ensurepip-wheels-100.ebuild 417 BLAKE2B fde456b6497fb25a0741fe04002795f9385a2317c6d7cde6740301dfa5f8d169ece108d5d07adf6eebe7c97531ae2b7c613d70e4f757c951c1289e9a41910fed SHA512 9773f450fbc8eed24169d7753f09a38b661fce0856567c9618ffc2a620babf7d4cc839b435e5b04f97dca9ad392b505c06b92da41ebd1eecbf6dd71bceb6264d
 MISC metadata.xml 357 BLAKE2B 2275bcbbf65269212f67a4524163fd07ae84c50ec48533b758e600c3d9e8e54db416d5e5a6d0b08f05a82b9c6adcf7df5ccb1ad3c760f79a615136c13235f7ed SHA512 0c30429f2ee7956f92537dcea88ed5e3598575a4b9b64935de0f437791e88ae3c9991c5759e670e7a1cba478a87be7675c4864a707d6a51d9b25540074f14963
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild
index ac5078255486..5045dcf488ae 100644
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/ensurepip-pip
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
deleted file mode 100644
index adfa2e2b013d..000000000000
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
-PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
-
-DESCRIPTION="Shared wheels for ensurepip Python module"
-HOMEPAGE="
-	https://pypi.org/project/pip/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
-	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-"
-S=${DISTDIR}
-
-# combined license of setuptools and pip (with its bundled deps)
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
-}
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild
deleted file mode 100644
index 691136b4b5bb..000000000000
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
-PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
-
-DESCRIPTION="Shared wheels for ensurepip Python module"
-HOMEPAGE="
-	https://pypi.org/project/pip/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
-	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-"
-S=${DISTDIR}
-
-# combined license of setuptools and pip (with its bundled deps)
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
-}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index c929027be8b2..0ff176fb5595 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,9 +1,5 @@
-DIST openapi-core-0.14.2.gh.tar.gz 57519 BLAKE2B 06dfd284612ca11a271f075444db9b859ca5416e31594680d6b32abec1fe917105f213209d1bfcb9664b265ea3d62839579134e8e104754075cd692d1ba7a99a SHA512 19a2508d56053214993abed7d173d17b55a80dac6421681d7c64082f910bf9cb03c99d4006a2cd883d51d54f11a18f90188f141a78b9d69a9a031c284a14f8f1
 DIST openapi-core-0.14.5.gh.tar.gz 57645 BLAKE2B c5c9c308b93a37e32708677cc7c7a2ccb9ec3f018390e56a251224b6b8776943ccd0ddfb560cdc3f1182cb32a9b2817878a0d4dda3906c179db9841853caf7ac SHA512 69d9fb2cc21dfdb939beae45b1c681faf9f8e3366b36e5907b00be65ac669ec40e3ae3fe910fb2c4f6c70d1412e6a67e4e4e47e3cf2c424716da4c813223295e
-DIST openapi-core-0.15.0.gh.tar.gz 73274 BLAKE2B 8bae95a3a70438702d6a49c06954dba610766b945076357cc32382b59efbbf2d839a282b41b3d96f75b25e8864c0b9f9bfec1eecd8056e205bda5d62fbc6abc4 SHA512 3e9327fdf7d8b84d29627bfcb9a7c7e471ddf8cb06c5b2ffd3518fadcb872738cdfc5365558c51b8e0526bfbe5a841b9bc9598d630c6c6ddf141dc9c6681c3d6
 DIST openapi-core-0.16.0.gh.tar.gz 79041 BLAKE2B 93745787d39dc2e77e6b268792548069e7637ea7acbf4975224d837b87f301ea5ae36c07aec5b8f44b6e7a5480aab744e9601663f080d63f27b8a49aeb9cd7f5 SHA512 70ed773926c16df9d085e7ce104a0a99ccc52e8e0ba395ead1cf5e9cba1e43723bb7a744cd2b9c27e3a8a48319f8265dc5745c20cc23e825fa28ed3b2fcd3e25
-EBUILD openapi-core-0.14.2.ebuild 1733 BLAKE2B ba75a26c077c9b9ac1c09f321c941d96cfbc4b37404d77481d9d0a03ddf93e931ad4a5b623a7bc3fcf48c4157b4f31989c0fdaa45e0f132d5a1d54a35173e94c SHA512 cbe22ad4328af6634c37a4348edca2ee841db605f4d09a3a4c4a63548d077acad7bea0742a375229a0c777bfb4dff137ea3c40ebc256486c810e6b17e6b3490d
 EBUILD openapi-core-0.14.5.ebuild 1780 BLAKE2B 69e455d8d5e1d10359239a6c5463659fa5a85b43fa1e17ba19cd5bda9a9b6905808847f9ded7e7f2c028961c136697efde9309df9cc5e2509117a51f4c166ebf SHA512 ac6902c71cb38a390776af35c0fb2d460e2862ee3c2ad9ef09ac68c0a7a402f33be8c5fd0dbc18db2ae3c8c4d97a1448d40c349fa8828700e26bd516c8262ea1
-EBUILD openapi-core-0.15.0.ebuild 1509 BLAKE2B cbebd6c7b73dff0acf65a1ac28b2cba6c9485dcc50b0b802bdb0cc3d5672d148923dc78ad600c5b3e0e9d7b62fc0d5d9101ff5642e6eb3c26ade8d894588eeba SHA512 77689ea82e80566ebb6eeadf5c79aeef9dc0a26129a48876106b27abfa15ec7b67ba1dcee26c7aa0bf851a115c50763ea0c00a95884740639166104b61b40621
 EBUILD openapi-core-0.16.0.ebuild 1818 BLAKE2B 3df6eb891f5e4126faab5207c1ed2bc4e25970b2c4c45aa8f2f1e12fef98d735bdf99ba4c0f4b1e8f7ff553a1369c1bfeb6dec6ce88932091187fe7e5a53e48a SHA512 972d6aba4f1f51389cb061d7c7887eb288dc53d2af4f3042d7632d5f7e51812861e95dd81bae1c57cae63fbf8825fbbd0426e92f66d4546d2f7e3473d050450b
 MISC metadata.xml 376 BLAKE2B bf1f9cf9377b172dfb5f916332dbf9d1e485f3ca1f31f754afac41931598c1780c474989edbfcf39bbfd4ceb8e8030280cf0997514dfb8e02bf3294176fc3dfd SHA512 c7fbdc21a2ea86abe5bcf4a3e8ba97634a447926ce999aff761965ff411fb05b09fab5e5338da5f8a8486a6b024cfeb27cfb9d9fbbfc9bad6f9dabaca1c82799
diff --git a/dev-python/openapi-core/openapi-core-0.14.2.ebuild b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
deleted file mode 100644
index 8f30b58a2c65..000000000000
--- a/dev-python/openapi-core/openapi-core-0.14.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/dictpath[${PYTHON_USEDEP}]
-	dev-python/openapi-schema-validator[${PYTHON_USEDEP}]
-	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/djangorestframework[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/responses[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# falcon not packaged
-	rm -r tests/integration/contrib/falcon || die
-
-	# Theses tests fail to collect
-	rm tests/integration/validation/test_security_override.py || die
-	rm tests/integration/validation/test_read_only_write_only.py || die
-
-	# There's a problem in the test suite here
-	rm tests/unit/unmarshalling/test_unmarshal.py || die
-	rm tests/integration/contrib/django/test_django_rest_framework_apiview.py || die
-
-	sed -i -e '/--cov/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.15.0.ebuild b/dev-python/openapi-core/openapi-core-0.15.0.ebuild
deleted file mode 100644
index af9428866296..000000000000
--- a/dev-python/openapi-core/openapi-core-0.15.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# falcon is not packaged
-	tests/integration/contrib/falcon
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 09fb4c504de3..b349ba487adc 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,7 +1,5 @@
 DIST openapi-schema-validator-0.2.3.gh.tar.gz 25501 BLAKE2B d961cabca647f59d4d4188f1941ce5b2475e02520bcc10e7cd29817c8ea8ebaaac5af1ffb0e3d5079ed2d1493414cdaf55336744b142385754585e748af8ac98 SHA512 e6dfe3d6cc99fa9723102ced42040203157639be68b0438d7bfae4499e51cdb6257a36dca10425a5d5e692cebb958468ebeee722116b99d800a6fcf972400c66
-DIST openapi-schema-validator-0.3.1.gh.tar.gz 23232 BLAKE2B d02f9004d7baf96e76fb035e212efbdb773f1d7685c8b73107d887ad1cdf2496afd4232bd4fbb263597106b6a7e7d0eb7e6efbe64f422ca11ff228d5f2f51fdb SHA512 72564409e80c8dd8578ba2a363865623aa03b8b2324abd37bea31c503632a367bacf81d8de801579b80347906d2b24c14371c9b37b70176e0bf51ca8c6b9e071
 DIST openapi-schema-validator-0.3.4.gh.tar.gz 16593 BLAKE2B 17882dff25d1bed05efa74792930a357d82cb404bbf746a6f348e9813b4af86842da1523a8e3dfaec1426c82efff6b0bddbfca89c8569ba36a4324ab4e5a418b SHA512 714f93594c875a04194a6980dc5e092866609787e424ef480d42da93c114e3b658a5efef13f78ed3db35f6e7399d7dda8adbc1d3bb8606512aa4f135edeaeb75
 EBUILD openapi-schema-validator-0.2.3.ebuild 857 BLAKE2B eb473e375f925dc889aafd6ffbae05880a663acb1b4a929795f9ef555e6dd92591aedc9f092e593fd3b8f8500b62f36d3e7101a791baf24296639fab7c39dfb3 SHA512 98c81c69daffc9d3f19a686e9b343ac0fd5bd74a966a129259d953895066c5216c6d6398372fe053c08b92b3da2915b204b3a5df5f183d51a5c91fc3b5b6f8ed
-EBUILD openapi-schema-validator-0.3.1.ebuild 900 BLAKE2B 732d75215eafdae0d32086ece6a9f9b50d28151d4657e6d8ae972fb6b0afeab322bb3c5456cdd438dee67860b7e22a5ada50d338da218c328850db34a99322ca SHA512 0279a3ac817c913271ac58edf1a188e67eb1cd5fb09198e5469a0b700d01fa75e059d49a441098b4bce845c94cadd5bfaab712bfa83629d0749f8e922e3f421c
-EBUILD openapi-schema-validator-0.3.4.ebuild 902 BLAKE2B b6686aecd51239bec1f3c81b6acd0d1c116f0cd6b72c010d2a71c19495e0bad80b6eae755739c53e7316f4ac0c67b13aa042f1d29c18bb3823f0bcfb4c30998c SHA512 d004c4106efe6ab0d3a965c761f12931ff641b940eb8cc3cb1a0e17fd4fb2fe2e2b59f8fa90ea5e964b32d1d8a897bfbcfdfd85eec1b664dfdccbb453d5b60f3
+EBUILD openapi-schema-validator-0.3.4.ebuild 900 BLAKE2B 732d75215eafdae0d32086ece6a9f9b50d28151d4657e6d8ae972fb6b0afeab322bb3c5456cdd438dee67860b7e22a5ada50d338da218c328850db34a99322ca SHA512 0279a3ac817c913271ac58edf1a188e67eb1cd5fb09198e5469a0b700d01fa75e059d49a441098b4bce845c94cadd5bfaab712bfa83629d0749f8e922e3f421c
 MISC metadata.xml 400 BLAKE2B 7869b5ce26c516d7e8ac441229cc5e749dfe6ee5fea478a0d5a0574bfbb863434d03f5c16332376337c33f4215877b985251cd5a2e71caf445a16f52283a63fc SHA512 071df32bb4ad2c941aafb9232ff890ec9e1150ee789eb9e335a94024ceb7bf6b7b79cd8f9f0ca16fc08c6e19383616253d391710b4d1e2796d57d12ff00436e0
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.1.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.1.ebuild
deleted file mode 100644
index 24015e17c437..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
index 79fa33f1e09d..24015e17c437 100644
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index 0ba3356a480c..b7b849cd0ddd 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,8 +1,6 @@
 AUX openapi-spec-validator-0.5.0-std-importlib.patch 1451 BLAKE2B ed6a94863f92e5eef2b443826239ccd110b1caacc559465edb0bada4028c38164e9fbfd1a4585211f5384b76866f25dcf55f229ce3582fe377ed2d7f1e711745 SHA512 2d1550cbd8364f26d62e709567fd08e5a134b5ab69ec88fd2f00c928f878c811ef850ce4ed01ac79abe583c84403de912c9845c3ccd264707b403fe1c9ee0544
 DIST openapi-spec-validator-0.4.0.gh.tar.gz 46051 BLAKE2B 43a1458ab1801700261f750e49d45b0cb4d02f1c17a16943b5232836061e0e1466fc973343bbd4bf7a8669b682bd6761cb905fdfb3b80c0b9720253cc2d5a926 SHA512 d2eaf22c75e72eb5061a916eb37b13179a5ba65eb8a00ec42e81c6b4168239bc8613388f2d77ce35113d260385b175280d8863a3deedf18ea5aa93a79f058419
-DIST openapi-spec-validator-0.5.0.gh.tar.gz 39173 BLAKE2B 0c9ac1617423b2f1983e1036b5bfddba3388ace454bb3df743d9d5fe62708fabd54ff4373b77901fc78e7e761d0cc059132a557e73bf5095618fd6f1f074bcfe SHA512 728f600962b493a0e6914d5ac662cda107929630e26b95fb3d5749579d90d278073f5b5d69445cbe90e4c3edbc2ee5de34045f34003a8c75a3d5a33df52cb1fc
 DIST openapi-spec-validator-0.5.1.gh.tar.gz 39539 BLAKE2B 66adbed2c85527f89e510d5cbc11ccf05f23546191e2677a1c34f7545d2e975dda37f1c53e988e37cf526663053ac0176567137273e3be9156b24deda89db6c1 SHA512 b70a2f926d889fec9d4fd26c51e1fbbeb5e75f13449d2d0205b1b7edb12ab2ba49e4cac69426f782ca3a4430c79a6de8f66b4aad2fc552bcfcf7005e866522ff
 EBUILD openapi-spec-validator-0.4.0.ebuild 1503 BLAKE2B 9630f20e77d363c1dbc99ab2a3cc6a5732fb1a9931fb39a7070e8822b24f4d45310b53287ca0c6fe3c09bd6f4a0f7acf01233b60b79c040954fd42fa36efddf2 SHA512 0c8f2cfbc74d2235fc83f579a33f781972b6756a632074ccea4a41f87014286b9edefb23d14fa3e311b81350372387ddd463a758d3f69c5c705ddb8a64db25af
-EBUILD openapi-spec-validator-0.5.0-r1.ebuild 1990 BLAKE2B 30452245598e26e2767ea4a321d12984a27d9535c5f2dfa016add8de0fecc07571a9d609bd6adf908905bce492b716df6c8af121de3c087805b72c6a0ece5321 SHA512 96e4029db60d3184f274292d3f7bcaabfc5210dbd06de267c903150adfc1bdc0313cb4c61d994b557fe925544aa91c7e3c5ab14f5402fdab5ba3d97bdb01c3e6
 EBUILD openapi-spec-validator-0.5.1.ebuild 2009 BLAKE2B cc65b429451bffa38f411ac386598fa6dccaa45126123998b097fc1e70c49593a996b4429e319399f595506a519ddb2ea6eea1f4a3d95b6e43b9aa79290e20d8 SHA512 35d971044e88717f779574471177f46b0b66dbc0fb67286bd3d8a8b5ce9779e1c2224977ae6a6a3e33bd1c9b94fa491c526b0310e5d735d0819009e6850694e1
 MISC metadata.xml 372 BLAKE2B 6b08d5f1a63e2ddf4c0f1ab8479a18109231211c82a2a1178a9e1d0775ad0fd5811580c3b2175137ec135b6c8d8ad0e0d728d79da98c092fd87fc604c7cc8a4f SHA512 4fe628abc1481b9dd5874dd5efaaefa5f1adf24e2e58183d2ca75677680077a443702887bb21c67049df998052dc6afae590ac9197b6edb87cc10c126ae22345
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.0-r1.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.0-r1.ebuild
deleted file mode 100644
index 058e1fc7c0ec..000000000000
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-spec-validator/
-	https://pypi.org/project/openapi-spec-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.8.0[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-PATCHES=(
-	# https://github.com/p1c2u/openapi-spec-validator/pull/174
-	"${FILESDIR}/${P}-std-importlib.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_shortcuts.py::TestPetstoreV2Example
-	tests/integration/test_shortcuts.py::TestApiV2WithExampe
-	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
-	tests/integration/test_shortcuts.py::TestPetstoreExample
-	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
-	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
-	tests/integration/test_shortcuts.py::TestApiWithExample
-	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
-	tests/integration/test_validate.py::TestPetstoreExample
-	tests/integration/test_validate.py::TestApiWithExample
-	tests/integration/test_validate.py::TestPetstoreExpandedExample
-	tests/integration/validation/test_validators.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 323f87e67f5f..4ae4842c8db4 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,5 +1,3 @@
 DIST pygraphviz-1.10.zip 120582 BLAKE2B 965b84ec6951c364084ddde4f0594ad7c14eb7e884062ad4f24042b6298b9caf10b3aa33eecfe8154c87c4bfd8d3651acc586129b019aef8b809130d69c03f82 SHA512 571c35f7a8013d5f128fcfbbd68372c8660560847afa0648737eae6d305a9283b69dce23a1b1aeb808bd4eac9c9cefa72b1d358fbc47b724a0b70997ea3f6d84
-DIST pygraphviz-1.9.zip 119946 BLAKE2B a399742ae5e8323eec0b6890858cc9158c2942c4f0adb8c74fbfb9745321ae013b93227540e5c328f5dd22d8fba2cf9217a9079f99a14feb983d7188e07084c9 SHA512 0a963b2cfe526c5444379b037797504380898c300256ab3b4800687f46b6230d8bc0adb5f499004a8009544c6cc804221689921c08a4f4b71b86ae01dc39cb7e
-EBUILD pygraphviz-1.10.ebuild 974 BLAKE2B a94104c6e8844b18f7f7fb3663f58156cb1d1d8d7898b8cdf14868df5723f51d02d14890be4de6243bee3d552da36da20dbf4dabe4ce406caed2d2a5db71d3a9 SHA512 80a37d11ada03e067c5afe5d161609269c4f0dd405cfbf610fe651f92b4945dc9bfb11ed41c487a64abaddfb142dabda6f3e1afd593cb1e83a26fce64a9d3186
-EBUILD pygraphviz-1.9.ebuild 973 BLAKE2B 38e56a0ba861bc6d996384770ec122ea8714a1674b004d78929a5f4770d49a2d58cc607a59b387cd35adeb956362ee1cb38573d9a67875ce371065684150ab1d SHA512 a7a349ca26ec994ae984e26657a3ecabb27fe41b6443186a9bebabe94c7b89007d45df3e7fcfd5242aa9fcf6945153a837a66c3f5ea235f89912fef53a370273
+EBUILD pygraphviz-1.10.ebuild 973 BLAKE2B 38e56a0ba861bc6d996384770ec122ea8714a1674b004d78929a5f4770d49a2d58cc607a59b387cd35adeb956362ee1cb38573d9a67875ce371065684150ab1d SHA512 a7a349ca26ec994ae984e26657a3ecabb27fe41b6443186a9bebabe94c7b89007d45df3e7fcfd5242aa9fcf6945153a837a66c3f5ea235f89912fef53a370273
 MISC metadata.xml 680 BLAKE2B 8c27b9bad68a0cbad1f63ad26052eef28e3446b0833bd2f87600737e763c7438cc3ac3f956c0e2a7964a7962d63dc0b7c5cc0cd8e6d61e6eb653e78044f9dd45 SHA512 7ee41b408d35f114dacb3ab9fd4ccd846ea6a4c865266d9bcb58988c464a0282e9dd2e9dc2e6c3f5a264dc93d4ba59a2e0bf27e9003b97e02b37dede273e17da
diff --git a/dev-python/pygraphviz/pygraphviz-1.10.ebuild b/dev-python/pygraphviz/pygraphviz-1.10.ebuild
index fdf4d3fdde7b..ea6e7fdd49d9 100644
--- a/dev-python/pygraphviz/pygraphviz-1.10.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pygraphviz/pygraphviz-1.9.ebuild b/dev-python/pygraphviz/pygraphviz-1.9.ebuild
deleted file mode 100644
index ea6e7fdd49d9..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="https://pygraphviz.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-lang/swig:0
-	test? ( dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	swig -python pygraphviz/graphviz.i || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/install || die
-	epytest
-}
-
-python_install_all() {
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-mpl/Manifest b/dev-python/pytest-mpl/Manifest
new file mode 100644
index 000000000000..782942fd33ca
--- /dev/null
+++ b/dev-python/pytest-mpl/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-mpl-0.16.1.tar.gz 663585 BLAKE2B aad171260a10417aab15e7e55115c2fe02aa33dcf8336634281e1a1dad4d1c5ff08293fd9a67be025ec6cbb18c42bc9eb7ccb86275c0fcc7f4bf33a035fc0927 SHA512 64c1689f1698f9223082bc5c6817a1d4f9b413cb193894c23b1e0302254a6358cb3e354ac92ec47677acf460a41d05b2b527c834fd0fbbde04c070b0af8f46e1
+EBUILD pytest-mpl-0.16.1.ebuild 1080 BLAKE2B a1dfcc77eff6d5cc944cbd0597815a91a1db4c44dd73bc0328ea82b7df5cad93fdb6d2485255a416510ed895192818825415539e583781322b8a277740c50d20 SHA512 96264f222e57741e45ea99f2da31d1061967cf7fca0757116794e3b3247c7cdc76310ed37b700c5f94403c4c7e08b818811bcfa266f8a56dfa1816b3a9667090
+MISC metadata.xml 399 BLAKE2B b2dd8993ce1e55737997ac3e6c0d26edecad7721c319073b8bc12117b1387dd3b6a1049837b5f97d97f5539d1253bf888f00caca6f0bbb46a73292ee6bd08f0f SHA512 5e3c8b4c47771acf6fe345f3e1d1ae59e66a2bd028ff57969cd3a93aef971b7103a7b0d847f1e53af54075603f9868d5c09895f4ea3a1d93009b07449496d317
diff --git a/dev-python/pytest-mpl/metadata.xml b/dev-python/pytest-mpl/metadata.xml
new file mode 100644
index 000000000000..c9b79fa5f81b
--- /dev/null
+++ b/dev-python/pytest-mpl/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="pypi">pytest-mpl</remote-id>
+		<remote-id type="github">matplotlib/pytest-mpl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
new file mode 100644
index 000000000000..9db1c3e57234
--- /dev/null
+++ b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Facilitate image comparison for Matplotlib figures"
+HOMEPAGE="
+	https://pypi.org/project/pytest-mpl/
+	https://github.com/matplotlib/pytest-mpl
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+	tests/subtests/test_subtest.py::test_default
+	tests/subtests/test_subtest.py::test_html_images_only
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	#local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	#local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 4286b4227001..f9d8a74025ce 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,6 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST setuptools-65.3.0.tar.gz 2615722 BLAKE2B 1344fe17c1c2a4ec60dbf37b3e1cbad56bb5299bed9f8e30a21015f2457e1e90d6782369dfc2d804973e7348d22a356ec0ef75d1aeabba7d77e20e5ddf36e576 SHA512 3c173b1e1a8dbbed0bf3bf600df1256aeabf1b9dec34d5f5d0b1429b0fe16f2aa61fa6c4f400a5b6da24b9d679954866b76e019130bcf2246b138fe017025de9
-DIST setuptools-65.4.0.tar.gz 2615629 BLAKE2B 778b0acf1a447fbc72043113da757d73ca5dc0df8e6be8dceff7e35d64a920793dca6098d8747bd66bfe1159236570bffb6f2545a0f89a2a7916f94f849b89a7 SHA512 4c8c6348fc5e9e2cc2d7b143b050103e7ed4252dd58ca5aae8d50ee9ec522789ecfbe61dd87513d47bfd1d4afc290a7abc07fd0a6e8d27155c6732111702032d
 DIST setuptools-65.4.1.tar.gz 2615710 BLAKE2B 12e644412c7f910a8bf6fb470e0c7e78bcd11a9403d7d0821eecad156d0a4ed03751de6bd6c51ebc2ce1c0925386120971c0da129ebd7e1b8376feee1f8edc7e SHA512 d13253bb556380b1b45d4b51dc7922b0cffa390ba92d97ccbc43c314aceccdcf51ee8b5c751cf6f36c6c8955836bc248214d55fe7419ff0332719862772f0f95
 EBUILD setuptools-65.3.0.ebuild 4261 BLAKE2B 3ee99d3763734ce401eca631ec21f1dc0497b9d9216569ee1f9decdbdbe59668a17a271a0db8fe7f1c646b3eef26772c3aa0b394839920ae9ce9d80e16fe31c2 SHA512 9c748d867f71d7c7c8eda664cd5a11c75d13cf1e82928ac9ef9a4fc3984208f1d9439941016dded058cc63f446b14099b99b86e3cd9055e2365c5b482ee24a74
-EBUILD setuptools-65.4.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 EBUILD setuptools-65.4.1.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.4.0.ebuild b/dev-python/setuptools/setuptools-65.4.0.ebuild
deleted file mode 100644
index c11a0923e907..000000000000
--- a/dev-python/setuptools/setuptools-65.4.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 9347c2827c10..eacfcb146384 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/tth/Manifest b/dev-tex/tth/Manifest
index 3bb6ed5a5bf4..b8d4dc7a9bf7 100644
--- a/dev-tex/tth/Manifest
+++ b/dev-tex/tth/Manifest
@@ -1,3 +1,6 @@
+AUX tth-4.16-Fix-build-with-Clang-16.patch 454 BLAKE2B 1d8e3205d23621d48378b075451913df8c3dbaffe359966d558515a25007d6e9ac07f31624ba769a1a24755acfe1e00f22618b6076d3f7a1624981523c0ddb19 SHA512 b756caf33e22db099c02383dd25fd390804212a1fe27855fa7f4ce5d6d8cd9ed966a97f1db6e9f7ac90804b69de650a1ec4fdab378d07eb0fe9f195b1351bb9d
 DIST tth4.08.tar.gz 1085293 BLAKE2B 260613fb9aa1e2acac5daf69db0ea5d3b6495dcb13f8eb3439a8774cf285fccf009dcdb77e33f265051bc9e9d35dda027212042678302b028efee7e4e1019e32 SHA512 c287cece1219155a5a23684b59f9c88459d7bbe7f029bfd6ca26562fa7a8f38699b4e5ce8a85a5f3544c081b5d1483f9533807b026dc85d130cf2e3eae507c05
+DIST tth_4.16.tgz 337901 BLAKE2B ace16726eec5539e81fbafc356c74ed1cc773457100e509cbb5b92fb8bf29bc82655e7d60c6b7ef0bb8e8e4b741c5613bb48e37b8c878757a6354ba1aa0d9267 SHA512 f4c8cc7a268fe8f235ace42a7345cd91efee90103d30b4c24f493982662c51b3d07f4beb2427e177f50e7615d68e1a26055bf3e287c401a9db81a25e614d9281
 EBUILD tth-4.08.ebuild 673 BLAKE2B b0e9ab66490c955217e771d39825b3225cbe3a7e826177a4a753dee598ad451e86c62121e8edb3ca1212b68c72832b6d495e4835c008920d483b7fa73688a2db SHA512 c031344b8f522c6c0da025ae3a56d70ce444dcdd535ffd10bd47fc0f49ee618d41101d5b097e8bb56de522a8fb47ed4350bab4582a38253804f7648b5559845d
-MISC metadata.xml 323 BLAKE2B 4a7798d20c979074662a346e4a3cee901452d4512cb8eb7f10fbe4d584ebb3bc572fca2f4ce459c9589284de3a9f9b7f36d7af910b0388c563891f18eb8b0e21 SHA512 998f6fbf80157132b153bc9180316ab8f46c793aabc44da08a31f95eaf65bd6d5836f4d2a743b7fb9cb8c0f257283a9f1baf8c4eb2b931e328cf876e6770ff45
+EBUILD tth-4.16.ebuild 935 BLAKE2B f2f737eccb91009aa717ecefdedb61e09162c9757a3bf3ada3aae4ac6d5bb2e9733be2dd7c858204a8b540697536eca059be265684367f1c39634e9c9fffdbc0 SHA512 b527fb188d9e22159631c90e2aa63ae4dc1f3569efa61f59dda62b559224a3c7ad4906edfd640b55d2f37cdc4b48fefe0053ad14d68e9e0d55d86bbbd33c0f08
+MISC metadata.xml 392 BLAKE2B d0babbaf1e6dba9da42b976bc1ee2f5cc33e17be11571e557205b61e18ec28e2219316b220942f9da7eb32d82b70bec35ef67c1ccea643f5e510f79da3201840 SHA512 a94c9055e27993855565b8e361531b0883144051e322d47e45ee6c9b01e7bab6e7a9569625dd31657dcf815a64b6e0a0c7dd34fd4b4277431cceaaa37c378182
diff --git a/dev-tex/tth/files/tth-4.16-Fix-build-with-Clang-16.patch b/dev-tex/tth/files/tth-4.16-Fix-build-with-Clang-16.patch
new file mode 100644
index 000000000000..52dc9a2d21f2
--- /dev/null
+++ b/dev-tex/tth/files/tth-4.16-Fix-build-with-Clang-16.patch
@@ -0,0 +1,19 @@
+From 70244cb4546e6114e08b7bdcf8459daddc9bca8b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 7 Oct 2022 18:33:03 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+--- a/tthsplit.c
++++ b/tthsplit.c
+@@ -6,9 +6,8 @@ Copyright 1997 I.H.Hutchinson.
+ #define LINELEN 256
+ #include <stdio.h>
+ #include <string.h>
+-main(argc,argv)
+-int argc;
+-char *argv[];
++#include <stdlib.h>
++int main(int argc, char *argv[])
+ {
+ int slen;
+ char *ch,*ch2;
diff --git a/dev-tex/tth/metadata.xml b/dev-tex/tth/metadata.xml
index c028b0abe7b9..a4178344e35e 100644
--- a/dev-tex/tth/metadata.xml
+++ b/dev-tex/tth/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo TeX Project</name>
 	</maintainer>
 	<upstream>
+		<changelog>http://hutchinson.belmont.ma.us/tth/CHANGES</changelog>
 		<remote-id type="sourceforge">tth</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-tex/tth/tth-4.16.ebuild b/dev-tex/tth/tth-4.16.ebuild
new file mode 100644
index 000000000000..446703397dd9
--- /dev/null
+++ b/dev-tex/tth/tth-4.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Translate TEX into HTML"
+HOMEPAGE="http://hutchinson.belmont.ma.us/tth/"
+# mirror://sourceforge/${PN}/${PN}${PV}.tar.gz
+SRC_URI="http://hutchinson.belmont.ma.us/tth/tth-noncom/${PN}_${PV}.tgz"
+S="${WORKDIR}"/${PN}_C
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.16-Fix-build-with-Clang-16.patch
+)
+
+src_compile() {
+	# Upstream support a wide variety of obsolete platforms and
+	# are still active, so no point in patching these, bug #874744.
+	# http://hutchinson.belmont.ma.us/tth/platform.html
+	append-flags -std=gnu89 -Wno-strict-prototypes
+
+	emake tth tthsplit
+}
+
+src_install() {
+	dobin tth latex2gif ps2gif ps2png tthsplit
+	dodoc CHANGES
+	doman tth.1
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 51477e40d0fa..cf9a95d05fef 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index fb7b66249982..f467a18ee6cf 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-applets-3.44.0.tar.xz 9396928 BLAKE2B 03fb970e4ebe7747aed9241e7512c6fe945650ac789cac5c5bc1e49958b1636f43b59c56caaf24a01785c84617cef4c9b3fa76931ed46d6f3ea8c4b74335ca1b SHA512 8a9a75590e96d0ef6af4775d261337b41b23779b86d38080014f49666fdaee68bc9ef58eeae94e87c43bd07b0b0720b867f03f2c2d0f2d8b7daea3c66251fc7e
+DIST gnome-applets-3.46.0.tar.xz 9248780 BLAKE2B 5bc61dbbb2f6a7c96a9ad6895936996025bfc6d99ac29ff552e62e5061866b1ef30384d6adecefee933cbb533184a47cb6c40c5c8c7562d4892817aa73628dab SHA512 826abf56f76925f0246b49194b09ec9ae43963c43e3f861269ab839c08823bb2b8b1b47cd20a93495bfef0d4220ef579190f0dd491c3cb2ed70fdd0483b1f007
 EBUILD gnome-applets-3.44.0-r1.ebuild 1381 BLAKE2B 07bacca2ce92f025ded74c9d8c879f56a4be2f7298a3b55071c7ecc527a3fc619729bfa0a247bdf71117fcc8be25eb4a8f556d60ea3796c391f23a0fe18c87fd SHA512 31bd90e4b209df51dcace443651885faf577ed084c4e29af9749555d1664bbae8b55fc800e7b3f66da484c00984e6d1ca3749abe6bf9d9027b1d57031d5e320c
+EBUILD gnome-applets-3.46.0.ebuild 1293 BLAKE2B bd323cf001c8e5e043cee866fd73db854c260d18d1ea8887e49546a6ef91b0b4c3aa92595b8f442f8afcc6c6f50a6f1191aa0b80b3a5046d26f7a651df6ca729 SHA512 4989c59c3849fcb217f5e761c6b4779e4c8490c2681ebfc9a8a45b761d1a0799b31956bde4b7115a3186602e4d7fc816988dc11596bf5919f9341bdcb630708b
 MISC metadata.xml 328 BLAKE2B 23e54626993373e58fbb0718c51e2b9c4eafcd7a0f2cd3968d05b72bc6a3cebeec386d96ab317cc92a17f08d17f8cb9091d6c47d4e6af49993451dd98b8aa04c SHA512 b4936e6332bbd5de094ec96060c84aa6eecc737260a093dc01da4687f68994a5a622eec0b3fce353abfb851b90c31ce7b0ee93e330d6ae2f4b288ab104655463
diff --git a/gnome-base/gnome-applets/gnome-applets-3.46.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.46.0.ebuild
new file mode 100644
index 000000000000..071ee2a00c9e
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-3.46.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="Applets for the GNOME Flashback Panel"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
+
+LICENSE="GPL-2+ FDL-1.1"
+SLOT="0"
+IUSE="tracker"
+KEYWORDS="~amd64 ~riscv"
+
+# FIXME: automagic wireless-tools
+# TODO: gucharmap could be optional, but no knob
+# TODO: libgweather could be optional, but no knob
+RDEPEND="
+	>=x11-libs/gtk+-3.20.0:3[X]
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/gnome-panel-3.41.1
+	>=gnome-base/libgtop-2.11.92:=
+	>=x11-libs/libwnck-43.0:3
+	>=x11-libs/libnotify-0.7
+	>=sys-power/upower-0.99.8:=
+	>=x11-themes/adwaita-icon-theme-3.14.0
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/libgweather-4.2.0:4=
+	>=gnome-extra/gucharmap-2.33.0:2.90
+	>=sys-auth/polkit-0.97
+	x11-libs/libX11
+	tracker? ( app-misc/tracker:3 )
+	>=x11-libs/pango-1.50.0
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+" # yelp-tools and autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-cpufreq \
+		$(use_enable tracker tracker-search-bar)
+}
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index fb821dfc5272..061d22de2141 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-flashback-3.44.0.tar.xz 884008 BLAKE2B d9815634216537f59aa3fb7c50c4ddfcb295a85c2548bd3f5669a1924cf9a3f46fba05a4d7a1cf265f514d5f0f1611992f8b120e76771140bc4fc35908e5c688 SHA512 7a39baa5e37cd01dc6d3b5fff3ef4c99240106f9e13c68c2ce1db19c3f9a672d4c22602e3ca3c4cff28226c3bd26525500bf002fb598c1af362ce15d7a92b55e
+DIST gnome-flashback-3.46.0.tar.xz 892424 BLAKE2B f752687a07d8b5205aebed47e0ece8b77edc32aa9fa934b9e14234119d3bf074b528eb1af8ea5841ca20c2f91511eac40e6a708835542bbdc8ea4e1d364984e8 SHA512 845d9cf3551295bc6dcaeeb141875ddb875e8cf885a2a3b17c4234dd40b37b8ed5279f07414c4cc7590369b394a7270c48d34d767bd0d1ef0189f4b73e73da10
 EBUILD gnome-flashback-3.44.0-r1.ebuild 2589 BLAKE2B b2e195c27f49b70bfe541b9e14b868e6aca6608bf6b7e0be5d5826f678feff24b096b2ec6864367656785b412a04a303d75af5ecf7f8e5abd2af923f514c7180 SHA512 a40c80376f19452dba585c7789d7accc70027686262df0a1e3891edcc6c9a8fccabccce360105772f27ef636127ffcd5f0c4f5d05b6932adf287297733dfa096
+EBUILD gnome-flashback-3.46.0.ebuild 2609 BLAKE2B 45df025d26969a5db247242e2ad28f353a17a7c022aee5b93044ddbad8818a697d08537850825a32e0e58a7f98222774b18f5266721bd738a03f90a9d7cb000b SHA512 19059a3eb5e0598a4f294729d6c2896a94897c2a9cb196906c543fa1992de6afeffcbe5640c39767f9e24eb0522d348a98b2340caebe7081142676b0108a9ddd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.46.0.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.46.0.ebuild
new file mode 100644
index 000000000000..e2dd4f98e62f
--- /dev/null
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.46.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2 toolchain-funcs
+
+DESCRIPTION="GNOME Flashback session"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="elogind systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2.32.2:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=gnome-base/gnome-desktop-43:3=
+	>=gnome-base/gnome-panel-3.35.2
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=dev-libs/glib-2.67.3:2
+	>=gnome-base/gsettings-desktop-schemas-3.31.0
+	>=sys-auth/polkit-0.97
+	>=app-i18n/ibus-1.5.2
+	>=sys-power/upower-0.99.0:=
+	>=x11-libs/libXrandr-1.5.0
+	>=x11-libs/libXxf86vm-1.1.4
+
+	x11-libs/libxcb:=
+	x11-libs/libX11
+	gnome-base/gdm
+	elogind? ( >=sys-auth/elogind-230 )
+	systemd? ( >=sys-apps/systemd-230:= )
+	net-wireless/gnome-bluetooth:3=
+	x11-libs/libXext
+	>=x11-libs/libXi-1.6.0
+	x11-libs/pango
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	x11-libs/libXfixes
+	media-libs/libpulse[glib]
+	media-libs/alsa-lib
+	sys-libs/pam
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+RDEPEND="${RDEPEND}
+	x11-wm/metacity
+	gnome-base/gnome-panel
+	gnome-base/gnome-settings-daemon
+"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--without-compiz-session
+		$(use_enable systemd systemd-session)
+	)
+
+	# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
+	# what upstream has each version (libsystemd replaced with libelogind). Explicit
+	# per-version die to force a manual recheck. Only update the explicit version if the
+	# "PKG_CHECK_MODULES([DESKTOP/SCREENSAVER], ...)" blocks did not change; otherwise adjust
+	# elogind conditional block below accordingly first.
+	if ver_test ${PV} -ne 3.46.0; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+			SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 735f296c67a7..7089a6d89dff 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-panel-3.44.0.tar.xz 2852688 BLAKE2B 2d31d9456cb94f5f7d4a7f02b1be7da901f79b32a098877d7b778570b67c7f9be42105f5dbcf0ee6eacdf5359349c31140677b87eedbe9c1516f63104be668d1 SHA512 b3300f6943c970b9a2ea27b9459ab82e634226372006b7748551e6c8c24897c9df4ab2bc5528eae6758d9cd431cb2428465ef30fdcc012ddac7c69cd4f43f966
-EBUILD gnome-panel-3.44.0-r1.ebuild 2145 BLAKE2B c18d6980334cb0172f83d2bba99594bc1d0ea7fea358de45a6816252db768c54195e4e3b940944d7abfbc7d1f3b3c6cf8715200f0ff0452fddec1e6153d9a1ab SHA512 451aa345b13832adf68d87f9dde2ff44139fd76cce2916f55ff1c8ebc9a30dda5a9db2893d73a5682f05633f3c3dd01a4168a83a003e278b1cba2c2eddb9525e
+DIST gnome-panel-3.46.0.tar.xz 2797164 BLAKE2B 48f4a070df7015a8cca2b5041329f3ebb88474abf42cd21f74514ef557426c260110916eb1e23fafec1f99ec2e339258241484a87a6cd52a293d7df6abfff001 SHA512 a49f3978bd9561973c41083006b831cf4fcb07408048106ef56dae7e0809fb3ec825c8b4a1c09e818255c7995c45a6d33aa4f47e61f778f4b1f29ccc7c9033f7
+EBUILD gnome-panel-3.44.0-r2.ebuild 2675 BLAKE2B 98c58888ad483038cd894ef950394fba176c981e288c7d400d08ea89010fa6c95cea51bf60ca40f518a544008e2bb37525c966e4e12979f6bd28e73c37d735ac SHA512 bc8a35636447d63a40bfb9d81376e09880274111b8e36202a7711bbf72f11691fd8d9a5577a0a08413394315989b514c22eb5a385ab95fd22942865af16cbf97
+EBUILD gnome-panel-3.46.0.ebuild 2605 BLAKE2B 826bf1bf7de9ca8de7e2970d7464684f28b53f326dfd20fbca36979c120c12b5bb6bd75e71fde215989736360be53cb35261741ee64839aefcbd2bcfda8b6e41 SHA512 2e0cfbdf402e6117f4063965abc39588ef7c56b3a64d6a2f3fa1e44ca23f97e9cb3a29fbb684e66d43737624075ee8a22565f4dbd8ab4d0636c4e0a67f769dc6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-panel/gnome-panel-3.44.0-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.44.0-r2.ebuild
index 248101e116ee..e2782d5ff07f 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.44.0-r1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.44.0-r2.ebuild
@@ -59,6 +59,8 @@ src_configure() {
 	# to force a manual recheck. Only update the explicit version if the
 	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
 	# elogind conditional block below accordingly first.
+	# DO NOT just change the version, look in configure.ac in which PKG_CHECK_MODULES-sections
+	# libsystemd is used and check if there are new sections where it is used!
 	if ver_test ${PV} -ne 3.44.0; then
 		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
 	fi
@@ -66,6 +68,10 @@ src_configure() {
 	if use elogind; then
 		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
+			ACTION_BUTTON_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libelogind x11)"
+			ACTION_BUTTON_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libelogind x11)"
+			LAUNCHER_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			LAUNCHER_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
 			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
 			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
 		)
diff --git a/gnome-base/gnome-panel/gnome-panel-3.46.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.46.0.ebuild
new file mode 100644
index 000000000000..24dcdd4a7d3a
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-3.46.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2 toolchain-funcs
+
+DESCRIPTION="The GNOME Flashback Panel"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
+
+LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
+SLOT="0"
+IUSE="eds elogind systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=gnome-base/gnome-desktop-2.91.0:3=
+	>=x11-libs/gdk-pixbuf-2.26.0:2
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.67.1:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=x11-libs/libwnck-43.0:3
+	>=gnome-base/gnome-menus-3.7.90:3
+	eds? ( >=gnome-extra/evolution-data-server-3.46.0:= )
+	elogind? ( >=sys-auth/elogind-230 )
+	systemd? ( >=sys-apps/systemd-230:= )
+	>=x11-libs/cairo-1.0.0[X,glib]
+	>=dev-libs/libgweather-4.2.0:4=
+	>=gnome-base/dconf-0.13.4
+	>=x11-libs/libXrandr-1.3.0
+	gnome-base/gdm
+	x11-libs/libX11
+	x11-libs/libXi
+	sci-geosciences/geocode-glib:2
+	sys-auth/polkit
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+" # yelp-tools and autoconf-archive for eautoreconf
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable eds)
+	)
+
+	# Below elogind MENU_* pkg-config calls need to match up with what upstream has
+	# each version (libsystemd replaced with libelogind). Explicit per-version die
+	# to force a manual recheck. Only update the explicit version if the
+	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
+	# elogind conditional block below accordingly first.
+	# DO NOT just change the version, look in configure.ac in which PKG_CHECK_MODULES-sections
+	# libsystemd is used and check if there are new sections where it is used!
+	if ver_test ${PV} -ne 3.46.0; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			ACTION_BUTTON_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libelogind x11)"
+			ACTION_BUTTON_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libelogind x11)"
+			LAUNCHER_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			LAUNCHER_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index c0729a6c0392..1f34c6dc92cc 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index db3157e56400..b37dd03b2ca6 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -12,5 +12,5 @@ DIST plasma-workspace-5.24.6.tar.xz 18500752 BLAKE2B 1e469e91e8f1828f0b819aaa03f
 DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb
 EBUILD plasma-workspace-5.24.6.ebuild 6504 BLAKE2B 70a8668b7062c419bc5b671f0e0359c590f5a340d2289b0688d24b3f5dac135ea3788863873a304c3c43ee38576424a29fe0dfe2ba60629cd63669b9606c379f SHA512 9d611f6ae062daac80f4d4f9fdeb8535ac5f567b9215797a4eba33e23fd808c3c61ab8b3956a4199e6b46635f766cd7f9bdb7cf20edb4907bb37746f5e54b51e
 EBUILD plasma-workspace-5.25.5-r3.ebuild 6955 BLAKE2B 4beeaeaf621f68f8157c78a4e576333a60406e2ab8759d597f964de1e0e26c63d1fc0ffbaab9c7e4f6a889ed43316a6fac079ceb40abe32ed67a0beeaa82b1e7 SHA512 655d9656974c138906ad15cacb67aa77f3c41386a490c1f02d77d2b727c29509162844c1ca2cb761fad27607d3e837e06d81a943b08c641960d2691bce7f9d73
-EBUILD plasma-workspace-5.25.5-r4.ebuild 7035 BLAKE2B 7387fc6adc862c8298c4a474f3d93b6a5a3fa94e37878db64c496a26ac3deea93bb3c5d51399d7b90ae33f2e8cd31ca1e6aa0e44cccd24cc0a3d61d9eec2f70f SHA512 1f1a4b3be272359a85456b623610dd3752571e35095f88cbc241b4a91547a7f01a900d934b0c6338118a7653c873be4c7b4a30690c52cc610b0f2279fccc827d
+EBUILD plasma-workspace-5.25.5-r4.ebuild 7034 BLAKE2B 3539851cf3cad460f3598a5e4ce0e1b997ea8d500fa2de304d7c3ca05bb1b81323519b4e11adfeebb7617d06dad9a90179d491aa209ed4b6ea873e20bf7c9943 SHA512 6cb92c9b73d02d4d543ba5c905c6569b205b762ebe6a6f9479c08398c545e7b3c3263dd63ed7de2eac699e281d8bce726ecf6bb2fc545ef1d90fe7293de9ac77
 MISC metadata.xml 726 BLAKE2B ee1a0b82d5852d7c68784107563ccf0245d26cfcc1c2f2bb4cef243b7ab9a0925c0cbe848f387ebe7928ea68cb50c9c267203c00535b716bdb1c7c56eb4cbcff SHA512 f7ffe99faf800f559dcd966c7f3f72523484a851870fcf9cead18b878f1089bc33a6d20fc682c2c45db012b1e908618bdfdb4590816554245c11dbb9baf10100
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild
index 4f4ea868b57a..80a378241b19 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
 screencast +semantic-desktop telemetry"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b4cf4773eace..dccfb25dc4c5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 5eceb14a2a40..25b2a88b458c 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-photos-42.0.tar.xz 2855624 BLAKE2B a980cc2f581f1f6834925426ba3e0e7e6c341d939b2fbe2aa40c737669fb09fcdd8bb64fd0dfbee640d8dd73061281b6b92f97cfb5737cbeca9788c9e01d7fbe SHA512 cddaa84596a180fb2a4d70db65c6e625e3d94bccbdc7bcc83ed577b9306210a2879e3d40f8823a9e097f78caa6fccc53404194e7dce0629db3ebda1aa428b714
+DIST gnome-photos-43.0.tar.xz 2857296 BLAKE2B f7e51fadcf213e9eb08e38629bc137e81afb67d227d2c9ddc6b2cc136eb18f2df7aae91112c61129d0a77439aac773925b2abd65f1267fb4a69ca66f86e72a4d SHA512 003f9bda3aa8a3d72aec960d7377d4df08784a95de66505b77ac2e2a75c44fb772fc560162f0e5195b4c3cb8a648263f2403ecc18648fafdc3e748eccf297e7c
 EBUILD gnome-photos-42.0-r1.ebuild 2456 BLAKE2B 3746d2de022510440c68e39efd70f72a11ae85a5e31b91b21ae3caf79fe9622cf31ec1b40de9b44261e948d2f88dc74a91d14fee444429d24fcc3ba0d50668b4 SHA512 8b41e4af554dc532ce44dea98fab43d0a9f7eb285347948ad6e3caf68ac44c5eab85e3dbc63c2f2547a09c3f685ea51b424e26e4f11ac047da1c91e776d7c2f2
+EBUILD gnome-photos-43.0.ebuild 2432 BLAKE2B c292b5845339c7ae4ade56056418d077479f797f07b050a4a5ea29aa96d43893594f04f4d70bfeead074a982438010db07d909326bfce333ffa064e2c5a70bcc SHA512 edfb2c621dbd75b7c7ca6a1edb9cd38690a1f07132c9e43ebd82782d9f63f43a867cc0d307c9753b12439aeba08302f9544c3e741f5b7d0e3f336431c9dc5bd1
 MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4
diff --git a/media-gfx/gnome-photos/gnome-photos-43.0.ebuild b/media-gfx/gnome-photos/gnome-photos-43.0.ebuild
new file mode 100644
index 000000000000..8546609fd357
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-43.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test upnp-av"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/babl
+	>=x11-libs/cairo-1.14.0
+	>=x11-libs/gdk-pixbuf-2.36.8:2
+	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
+	sci-geosciences/geocode-glib:2
+	>=media-libs/gexiv2-0.14.0
+	>=dev-libs/glib-2.62.0:2
+	dev-libs/libportal:=[gtk]
+	>=net-libs/gnome-online-accounts-3.8.0:=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.16:3
+	>=dev-libs/libdazzle-3.26.0
+	>=gui-libs/libhandy-1.1.90:1
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libpng-1.6:0=
+	app-misc/tracker:3
+	sys-apps/dbus
+"
+# >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts] # Upstream left this commented in meson.build. Probably comes back with the next version
+
+# gnome-online-miners is also used for google, facebook, DLNA - not only upnp-av
+# but out of all the grilo-plugins, only upnp-av gets used, which has a USE flag here,
+# so don't pull it always, but only if USE flag is enabled.
+# tracker-miners gschema used at runtime.
+RDEPEND="${DEPEND}
+	net-misc/gnome-online-miners
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	app-misc/tracker-miners:3
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/desktop-file-utils
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+DOCS=() # meson installs docs itself
+
+python_check_deps() {
+	use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test dogtail)
+		-Dflatpak=false
+		-Dinstalled_tests=false
+		-Dmanuals=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 063737165b58..4e7222b1b4c3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/flac-compat/Manifest b/media-libs/flac-compat/Manifest
index b3c0440f691c..392d66b8e521 100644
--- a/media-libs/flac-compat/Manifest
+++ b/media-libs/flac-compat/Manifest
@@ -1,3 +1,3 @@
 DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
-EBUILD flac-compat-1.3.4.ebuild 1438 BLAKE2B 3de8e40a4c7391d31a330926badd1f0e56c9db5b296208089b3142197983bfc0fb48b10599837abf2334d237e82f6d14342a2b0b9786407dfa7466b893991dd9 SHA512 4db1995e462e369717126250ee18aae83ecd8dafae0e95890d4c001ad164250310df1fac9d261c7fc5ca83e24c3c1255370840e6dece9bd9ad1dc40c99fe2f19
+EBUILD flac-compat-1.3.4.ebuild 1437 BLAKE2B aca3d8682b4697efd1617b1a2f6fd7a786b7d92c804445ecef2d52a91694e816d8fee999dee706ac229a8de6210ba76458838a056b71e8adfaaab795245f5260 SHA512 2c20befc168e83593555303aa422b70b796bf0227264259ea0d0fac127e0c5ee1cd93077adcf445d167458bd0d1932364292d89ee5552fcda2b40ee21ec7adb8
 MISC metadata.xml 328 BLAKE2B f204d66e57846152c096064928450d390da7ef9ff2c5b67b4cdd8b83638174363dff11f282e9a604159ec8713afcac56114b6705051af6b353dee5201526682c SHA512 a742889e639181db89974299b09a205320021bb577c55e467dc969950520f61981918f1ff2a990d788f73fda106aecf3cabe70fd40d0b0269038c16e9d08541e
diff --git a/media-libs/flac-compat/flac-compat-1.3.4.ebuild b/media-libs/flac-compat/flac-compat-1.3.4.ebuild
index f1494f4ae425..56e4ca2ad396 100644
--- a/media-libs/flac-compat/flac-compat-1.3.4.ebuild
+++ b/media-libs/flac-compat/flac-compat-1.3.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/-compat}"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="8.3.0"
-KEYWORDS="~amd64 arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="+cxx ogg cpu_flags_x86_sse"
 
 RDEPEND="
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 7d91733cfd96..eadc0a097a4d 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -3,5 +3,5 @@ DIST flac-1.4.0.tar.xz 783372 BLAKE2B 69fd756ae6a41bdf84a1237cb24949ae24126a6643
 DIST flac-1.4.1.tar.xz 1024160 BLAKE2B 9ed283a0e56e96667bb0c7d66ad9f9d932dc001bfe4c5a71b0302d393a829fdeae6cfa1b0fed5a1d243f32b73933cbbf29c7f7684314b60c2a05758925acde4d SHA512 72a5ced62e06407ddea3ed6dcd28bf8f56f3d45e0649ea38e1b778f7856041c68bf85c3cec0a55170c2fbc144626829fed132d386f7439f1d6e3d0b45f13dba7
 EBUILD flac-1.3.4.ebuild 1564 BLAKE2B 8bd7aef1a3ad5d9d4acdb92d19df3b6c3d667c4614d9263d59e345a3683bd8e24adf72129be46e355266ec33ff2239efcede265bba8874a1f251b8f5a21ed085 SHA512 cd7b12fd21f8d09b09028c5fd1d128f2826f3894ef3072328e0e6f51d5c62220493f1f4ec953128354369f3aa3e6f9e2a00a301766be43724657d0c72f3deab8
 EBUILD flac-1.4.0-r1.ebuild 1797 BLAKE2B 71ceb931c898a4b8b1a572559f4608d8060d217da2d2ea13190880fc8aa24a620fb617ce0153edf60c6628fcd8c00690153f1ced602c30082974ad521bc17a6a SHA512 cb9a1b2172435bbe9e4944398c957c02237a9900137a2fd70fb8f34f00891ca3fd42fc01aa90da44e01b03dbe1fa02006f9bf88bb0c7d3af9337a5202311d0e3
-EBUILD flac-1.4.1.ebuild 1846 BLAKE2B c694c9e4e3213ae8b0c6a18b09ba691fd3851d71fb71740bc58c2894ea4631a62f527c60db1ae3328bf058419b5cd332112e70ce4f3154b3df5b1efa90fb544b SHA512 d8b3e3825011fd379fdbbafa58ff117902242531ad244ed47d00fbf5ab42236d4c4ce443652f4e0df857aba5e567c5813d944685ba9430d87bd28e74d925cba6
+EBUILD flac-1.4.1.ebuild 1845 BLAKE2B 36d47463112bd5b2489cd79126c0e88442f28811b8859426c0249b8aaa5026135e149c4b5c9925a15399c6303e3abb0f7632404e2c829314589dfe0e2ab84fc2 SHA512 6e20611bc7101e97591e655581b61bde8ada1036ce6e3f473af3fb8e03cc5208675610b70cf407155469717ac753d9aeaa5692455a33e95fe62882fe8e294384
 MISC metadata.xml 377 BLAKE2B 9fa4c0dc0300b2d2deb791a29d7a2ce6b00e05399ccc29581bc4ab83b1bdff3fecd2edbe6cef3cf8b4111cae5064edf4ccec9205e6791fb57f41d363c6352e95 SHA512 9d9d3c80a5a7c0255476ddc86ebf2fc76e42fc278185e9d5c4c814ff395f6d7d74e9a3e680be2966e89113a76dd482e1fe53f761a59474cf46e8b2469849fc2e
diff --git a/media-libs/flac/flac-1.4.1.ebuild b/media-libs/flac/flac-1.4.1.ebuild
index 03e6d0c23570..79f65cbea66c 100644
--- a/media-libs/flac/flac-1.4.1.ebuild
+++ b/media-libs/flac/flac-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 # <libFLAC SONAME>-<libFLAC++ SONAME>
 SLOT="0/10-12"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx cpu_flags_x86_sse2 static-libs"
 
 # AVX configure switch is for both AVX & AVX2
diff --git a/media-libs/librtprocess/Manifest b/media-libs/librtprocess/Manifest
index 2f99a7965856..0c570c02fdca 100644
--- a/media-libs/librtprocess/Manifest
+++ b/media-libs/librtprocess/Manifest
@@ -1,3 +1,3 @@
 DIST librtprocess-0.12.0.tar.gz 158244 BLAKE2B 0fa18416b25b760541fd01285b5cc0c3a38d8ddb4dd88b45237fa0cd3f43bdb7831c06282e2c63ddee240c59f6641fb9233e2370d460e3ccdd2d86a5a75e318b SHA512 2eaaff9d9365b97cfb76cef36c0ba53d9b556f45d49bdcc84947ef3bf513240cec13d763ae7fc78589c2b68a739ed23477f6953a7329d8177275f81e5e588ddf
-EBUILD librtprocess-0.12.0.ebuild 385 BLAKE2B 359320c6f4f7bbeabff6d532fe59ba7228489264d60dcbd82549ebcf9906df0edcb1e16932092b019fe911aa421d0337f87751c1b7a4baf9d794753555c03268 SHA512 9f84fe5dd2e4d27d3bcf87ffb50b940a9e4d73bbcd8293a7b8d96d5a9da7615d6b056fbd93cb372667570a0fd5ab8f6c0ab585169888b87713af209e3cfa6d4f
+EBUILD librtprocess-0.12.0.ebuild 384 BLAKE2B 923e9861b7bf096f2853e892e2ed988cccafd103b763c200e19da71bc2b6832a671ef399eb207f1bda2902544717ff0f02f5dd6931114cb34929dc829edede12 SHA512 f96650a70c39a1b44ad5063a1e9dd7e85415c807e26f730decf8a584ee1ca46da2997c7b4d400e7bf0f5aa1b5f5f17f5ba448f9a0187b454bbe67506b14aba80
 MISC metadata.xml 686 BLAKE2B bfde95b605e302d99e08b5be18dc694c4b7daca573e72927ada1dce430a9743f5b660ac9111cfdce37605f206eab8c94cf2997bc99de83ddc24f3f2ead670fcb SHA512 1a191e865353cf6256585746d9ec198a5c39da080060990a53a1bfcc024b2d782785c661e63d05cc4b08d61e0410cd6686bc2f45442b46d04c55c3a59b02744b
diff --git a/media-libs/librtprocess/librtprocess-0.12.0.ebuild b/media-libs/librtprocess/librtprocess-0.12.0.ebuild
index 94a5bf06678b..6c56fd15df8a 100644
--- a/media-libs/librtprocess/librtprocess-0.12.0.ebuild
+++ b/media-libs/librtprocess/librtprocess-0.12.0.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/CarVac/librtprocess/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d555ef04b956..aa8845531282 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7f4ff7570376..a6259d7ed627 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Oct 2022 17:40:00 +0000
+Fri, 07 Oct 2022 23:40:03 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 15fb7a2c35cb..eb95eab070c3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529256 BLAKE2B a8ad285bac1cf4317c62825ad52e916f3d77cdd05175694abbde87461cf015178a8cf1dd6c3af6013668089990ee96f6cb9be7de7409b13ba538d09d94cde515 SHA512 3502c0b489efa2b78e07af6e3b1c1c817c21c7435c1db2224f9b91f9d0ce815b1514a1e3062680326c8a33813260f974b3b492221b06b61e7499b2dcad6eaeb1
-TIMESTAMP 2022-10-07T17:40:03Z
+TIMESTAMP 2022-10-07T23:40:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNAZHNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNAuNhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDyMQ//REzmLX41Nh6UqF7nQcYYhEObs58RaMbk90/WW9eXfLkU09MhPQ/QfXEs
-b05Ibk123BaClCtZHwffBzjyLXuf48JlSB2S7wnLQYNIFIGS47GktPpWYi4IpiBD
-hXmKNIvEBHAhA/J16gAENoEyiLpcKatvUZ6A2ugv7ctc4XCW+HdAxUy2ji0hh3qx
-7pPOzN66Gtq7EPTOT/g2fkB1pQ8UiFNaG3FesNF2NJSRlTTGEAsiusg/s/c/V3aC
-qI77cVCD2Zc0EXrBSAIXKP63zB72sk+KUFLf4HP3saSwoPqWsIjW+fuC1fhKdNi4
-VsBPlaza5Pamm6PNXoBVZ1XA97JZbm6oDjgTzBe3c9PvmSnhQbgIeW6y6Hgk7ujR
-7k0JhQeD5F7sAcz4waXNxKI7RZf9HVPsRPLMJP25526nWR34iMKEWxnONoI+5j5P
-iu8xUMXt0I3VNrGLsSi6E+McKbBqEpBbKiAsIJetX1T9Ih8Zx/Uh/qFIJwokUXdC
-oxxGXbAy5QK+dRyYW7V4C3loGaDN8QnbEI0NDRrONIsbtt9JimbHZ1mcdOQZ8VIi
-p1IsbPd47P4kyrYu8i1jxSqgB3igAA48xiNUo7RxyNimzVeweJmCpXA78q95pO5Z
-Z2EoYhHHrxJz9nUkzauwubryOa4awIKSshYMCurFIVtPizEEMSc=
-=7jL+
+klBAyQ/8DS5AHg4jzWQKYLHiLEVaXFVZCOjfEnO87M+INi/WtCA2TlwVdluUbjVZ
+HVA6+UsJ9aPflUcGIcR3cwg+9V+oor1/slYZXaOeTgur/j28/tNje2sU+FRYbOoW
+oGtkE4qSZ/77RrhAmShX+JoHypvulXt4JCjAb8PgqNNZhG0WmkRDr2MSeevlMBcU
+8W/MSJ4oP9dh3nHSeN7h5GjnP8bDrjwu/u3juYHyw0Kz7HkjH0Gtma+A7tCsfNCh
+FGbQlWlNv5H8EZBgF8Z2KmomdaUPkqXrPddOGv3OQZnrr6E3XeRrTjtbJn9ReGnr
+pu8HEul+L3OEFtlA3lvb4TSv+qQDi7yKKkj07MQOLvx2ONjkZMPpCoZAmkc75n7M
+64RBSdG+HEO/qqNzIdw3ZyC/krNcNy6NdVVyxHfJR1dvBdv1DraFqnMmeRF/TDcN
+x6MFFeshgGKBPNwHcgDESm3vbOlDBC8h0Ja3AVrGXdq2oZHI1v9jJhcLHk5rs1HW
+IcL0nKbBsvDtvu0OIm9UDyAWM+EFBbX3eKWZjn24VBr9w7eeI8ASI4/GBMvUDUu3
+xzjqScotyJFy4IYSKfM0Dhx8K3juEraoYVZwh103Qn/z689Oddv2Y0jEqilMiyp4
+LJxanQKU8kPAkJG96PYcyGYYcTUuFAyjK613EWRyCJRjyY0wJmU=
+=IZPN
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7f4ff7570376..a6259d7ed627 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Oct 2022 17:40:00 +0000
+Fri, 07 Oct 2022 23:40:03 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8870886a9ff3..fa8cc615dd8f 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 6394c934cafd..bf3ec2c0410d 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/attic-0.16-r1 b/metadata/md5-cache/app-backup/attic-0.16-r1
deleted file mode 100644
index 8dc36e563a09..000000000000
--- a/metadata/md5-cache/app-backup/attic-0.16-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] dev-python/cython[python_targets_python3_8(-)?] dev-python/msgpack[python_targets_python3_8(-)?] dev-libs/openssl:0= dev-python/llfuse[python_targets_python3_8(-)?]
-DESCRIPTION=Attic is a deduplicating backup program written in Python
-EAPI=7
-HOMEPAGE=https://attic-backup.org/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/msgpack[python_targets_python3_8(-)?] dev-libs/openssl:0= dev-python/llfuse[python_targets_python3_8(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/jborg/attic/archive/0.16.tar.gz -> attic-0.16.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=785c20679c9d0cfba462c8a415fa0ce5
diff --git a/metadata/md5-cache/app-backup/attic-9999 b/metadata/md5-cache/app-backup/attic-9999
deleted file mode 100644
index db7a99ea01b7..000000000000
--- a/metadata/md5-cache/app-backup/attic-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] dev-python/cython[python_targets_python3_8(-)?] dev-python/msgpack[python_targets_python3_8(-)?] dev-libs/openssl:0= dev-python/llfuse[python_targets_python3_8(-)?]
-DESCRIPTION=Attic is a deduplicating backup program written in Python
-EAPI=7
-HOMEPAGE=https://attic-backup.org/
-INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_8
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=dev-python/msgpack[python_targets_python3_8(-)?] dev-libs/openssl:0= dev-python/llfuse[python_targets_python3_8(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=785c20679c9d0cfba462c8a415fa0ce5
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 4c3cb846f9fb..ad39d06d2afc 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/podman-4.1.1-r1 b/metadata/md5-cache/app-containers/podman-4.1.1-r1
deleted file mode 100644
index a11e9fc90e18..000000000000
--- a/metadata/md5-cache/app-containers/podman-4.1.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst preinst prepare unpack
-DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=app-containers/cni-plugins-0.8.6 sys-apps/shadow:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
-DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
-EAPI=7
-HOMEPAGE=https://github.com/containers/podman/
-INHERIT=bash-completion-r1 flag-o-matic go-module tmpfiles
-IUSE=apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=app-containers/cni-plugins-0.8.6 sys-apps/shadow:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) selinux? ( sys-libs/libselinux:= ) fuse? ( sys-fs/fuse-overlayfs ) selinux? ( sec-policy/selinux-podman ) virtual/tmpfiles
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/containers/podman/archive/v4.1.1.tar.gz -> podman-4.1.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=904c1e2ea708ca33c5d93c3f9a3abc84
diff --git a/metadata/md5-cache/app-containers/podman-4.2.0-r1 b/metadata/md5-cache/app-containers/podman-4.2.0-r1
deleted file mode 100644
index 1849efc0f61f..000000000000
--- a/metadata/md5-cache/app-containers/podman-4.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst preinst prepare unpack
-DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=app-containers/cni-plugins-0.8.6 sys-apps/shadow:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
-DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
-EAPI=7
-HOMEPAGE=https://github.com/containers/podman/
-INHERIT=bash-completion-r1 flag-o-matic go-module tmpfiles
-IUSE=apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=app-containers/cni-plugins-0.8.6 sys-apps/shadow:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) selinux? ( sys-libs/libselinux:= ) fuse? ( sys-fs/fuse-overlayfs ) selinux? ( sec-policy/selinux-podman ) virtual/tmpfiles
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/containers/podman/archive/v4.2.0.tar.gz -> podman-4.2.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4230018163126f9517a4d34f94fcdf5b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 85c15a62f36c..a69253def07e 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/kramdown-rfc-1.6.17 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.17
new file mode 100644
index 000000000000..837206650c58
--- /dev/null
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.17
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.4.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser
+EAPI=8
+HOMEPAGE=https://github.com/cabo/kramdown-rfc
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.4.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.17.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=cbde43d24bfb15bc4878687bbe072bb4
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index a75b4a496695..e41577000cfb 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1 b/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1
index 675dda42cef4..06d4c052fc11 100644
--- a/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1
+++ b/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/884f3b229457c995ddebb46a16a7cc50ed837c90?filename=gnatsymbolize-2021-20210518-19D3B-src.tar.gz -> gnatsymbolize-2021-20210518-19D3B-src.tar.gz
 _eclasses_=ada	fc6c14ed095d505642b43326b744689f
-_md5_=d6faa0851628a2b194794558d3f27b91
+_md5_=fe50d50a1f036c1ac20bea892d529a7b
diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz
index 790d75b99864..8ecfc63de963 100644
--- a/metadata/md5-cache/dev-dotnet/Manifest.gz
+++ b/metadata/md5-cache/dev-dotnet/Manifest.gz
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.422 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.422-r1
index cb6454de3367..e9efef66faae 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.422
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.422-r1
@@ -1,15 +1,13 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
-INHERIT=optfeature
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
+RDEPEND=app-crypt/mit-krb5:0/0 dev-libs/icu dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=3.1
 SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.422/dotnet-sdk-3.1.422-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.422/dotnet-sdk-3.1.422-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.422/dotnet-sdk-3.1.422-linux-arm64.tar.gz )
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=b33e410e60ccf48c09f2db3e7ca3055c
+_md5_=abbd5ec63b55e5078827e5e5b59ffc6c
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.423 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.423-r1
index c5b5a8fab9a4..7ce26df70377 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.423
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.423-r1
@@ -1,15 +1,13 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
-INHERIT=optfeature
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
+RDEPEND=app-crypt/mit-krb5:0/0 dev-libs/icu dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=3.1
 SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.423/dotnet-sdk-3.1.423-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.423/dotnet-sdk-3.1.423-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.423/dotnet-sdk-3.1.423-linux-arm64.tar.gz )
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=b33e410e60ccf48c09f2db3e7ca3055c
+_md5_=abbd5ec63b55e5078827e5e5b59ffc6c
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.408 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.408-r1
index 1769f7b0cd75..9d0f89c51a23 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.408
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.408-r1
@@ -1,15 +1,13 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
-INHERIT=optfeature
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] )
+RDEPEND=app-crypt/mit-krb5:0/0 dev-libs/icu dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] )
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=5.0
 SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.408/dotnet-sdk-5.0.408-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.408/dotnet-sdk-5.0.408-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.408/dotnet-sdk-5.0.408-linux-arm64.tar.gz )
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=87a09588ed696232d41ab607ae216879
+_md5_=b360472310fd717814fb1b8f923f0137
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.400 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.400-r1
index 29a82090c2f6..33f359d9a859 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.400
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.400-r1
@@ -1,15 +1,13 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
-INHERIT=optfeature
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)] )
+RDEPEND=app-crypt/mit-krb5:0/0 dev-libs/icu dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)] )
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=6.0
 SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.400/dotnet-sdk-6.0.400-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.400/dotnet-sdk-6.0.400-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.400/dotnet-sdk-6.0.400-linux-arm64.tar.gz )
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=58cf22154ab1e43222fe970f7bb9f77f
+_md5_=becfceb5a46cbf9fa9383a38837075fd
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.401 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.401-r1
index 6a86c0baac02..44ceedc1a750 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.401
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.401-r1
@@ -1,15 +1,13 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
 EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
-INHERIT=optfeature
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)] )
+RDEPEND=app-crypt/mit-krb5:0/0 dev-libs/icu dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)] )
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=6.0
 SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.401/dotnet-sdk-6.0.401-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.401/dotnet-sdk-6.0.401-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.401/dotnet-sdk-6.0.401-linux-arm64.tar.gz )
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=58cf22154ab1e43222fe970f7bb9f77f
+_md5_=becfceb5a46cbf9fa9383a38837075fd
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 47e5c3fce9c1..8036291287d8 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/objenesis-3.3 b/metadata/md5-cache/dev-java/objenesis-3.3
index 00dfc5226576..c420d1dcce0b 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.3
+++ b/metadata/md5-cache/dev-java/objenesis-3.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://objenesis.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/easymock/objenesis/archive/3.3.tar.gz -> objenesis-3.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=273f222b8ba9ad480097b4eea930ac2b
+_md5_=a3f7c249a657dea60f015b9ce80d3ccc
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 81e4d70e68ec..9fd02e7c7783 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/boogie-2.15.8-r3 b/metadata/md5-cache/dev-lang/boogie-2.15.8-r4
index be43e1fd1e0a..4f35c25c0a43 100644
--- a/metadata/md5-cache/dev-lang/boogie-2.15.8-r3
+++ b/metadata/md5-cache/dev-lang/boogie-2.15.8-r4
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/icu virtual/dotnet-sdk:6.0 test? ( dev-python/lit dev-python/OutputCheck )
+BDEPEND=virtual/dotnet-sdk:6.0 test? ( dev-python/lit dev-python/OutputCheck )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SMT-based program verifier
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=edo multiprocessing
 IUSE=debug test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-libs/icu virtual/dotnet-sdk:6.0 sci-mathematics/z3
+RDEPEND=virtual/dotnet-sdk:6.0 sci-mathematics/z3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boogie-org/boogie/archive/v2.15.8.tar.gz -> boogie-2.15.8.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/boogie-2.15.8-deps.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b241c6e6bf57235fa4596581ab73b193
+_md5_=4d791ba9f8f18154933e3fa1c6e6b7ef
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2020 b/metadata/md5-cache/dev-lang/gnat-gpl-2020
index d9874e21b364..cc5e67bcb574 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2020
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2020
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=9.3.1
 SRC_URI=https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=gnat-2020-20200429-19B04-src.tar.gz -> gnat-2020-20200429-19B04-src.tar.gz https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=gcc-9-2020-20200429-19AA7-src.tar.gz -> gcc-9-2020-20200429-19AA7-src.tar.gz https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=gcc-interface-9-2020-20200429-19B10-src.tar.gz -> gcc-interface-9-2020-20200429-19B10-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-5.tar.bz2 mirror://gentoo/gcc-9.3.0-patches-5.tar.bz2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	91c07e1bd43a5c526b67d956e9c0fe04	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9204bdac5e41aa901db39c4a1f328db2
+_md5_=bd9e9975f2d0d32625f5b149c9f8e319
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
index e51fa7036a0d..cb62b57a4cba 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
@@ -9,9 +9,9 @@ IUSE=+ada +bootstrap test vanilla +nls debug +cxx +nptl +fortran doc hardened mu
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	91c07e1bd43a5c526b67d956e9c0fe04	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fa8fd8a43d3d6b6035abb3fd96dd4496
+_md5_=a25fba29aa285bb0c651f735bce6d81b
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r4 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r4
index 7addac19c20e..8605ca09652a 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r4
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r4
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-4.tar.xz mirror://gentoo/gcc-10.3.0-patches-4.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	91c07e1bd43a5c526b67d956e9c0fe04	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2bcd3dcf866291a49c57ddc1393a5094
+_md5_=873236366d743eb9d117e2093e4dbf6f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 00e6f57e272e..a2117b8b3f5f 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/gjs-1.64.5 b/metadata/md5-cache/dev-libs/gjs-1.64.5
index 61ff76074132..1545fca40edb 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.64.5
+++ b/metadata/md5-cache/dev-libs/gjs-1.64.5
@@ -5,7 +5,7 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 INHERIT=gnome.org meson virtualx
-IUSE=+cairo examples gtk readline +sysprof test test
+IUSE=+cairo examples readline +sysprof test test
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.61.2:= dev-lang/spidermonkey:68 cairo? ( x11-libs/cairo[X] ) readline? ( sys-libs/readline:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.64/gjs-1.64.5.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=67142aab6ffb8f733e05c8f0948dcd92
+_md5_=c8f1fd8770100769d9f8e22f45c71747
diff --git a/metadata/md5-cache/dev-libs/gjs-1.72.1 b/metadata/md5-cache/dev-libs/gjs-1.72.1
index 1d5aaef9340e..f0862771e8df 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.72.1
+++ b/metadata/md5-cache/dev-libs/gjs-1.72.1
@@ -5,7 +5,7 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 INHERIT=flag-o-matic gnome.org meson virtualx
-IUSE=+cairo examples gtk readline sysprof test test
+IUSE=+cairo examples readline sysprof test test
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-91.3.0:91 cairo? ( x11-libs/cairo[X,glib,svg] ) readline? ( sys-libs/readline:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.72/gjs-1.72.1.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=e6f1b00e5c0ed1321c415ee43d02cfb7
+_md5_=0eaad24543c2ef432212489a75449c10
diff --git a/metadata/md5-cache/dev-libs/gjs-1.72.2 b/metadata/md5-cache/dev-libs/gjs-1.72.2
index 18e0b8b51bda..7aa8f1b7e8ac 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.72.2
+++ b/metadata/md5-cache/dev-libs/gjs-1.72.2
@@ -5,7 +5,7 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 INHERIT=flag-o-matic gnome.org meson virtualx
-IUSE=+cairo examples gtk readline sysprof test test
+IUSE=+cairo examples readline sysprof test test
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-91.3.0:91 cairo? ( x11-libs/cairo[X,glib,svg] ) readline? ( sys-libs/readline:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.72/gjs-1.72.2.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=e6f1b00e5c0ed1321c415ee43d02cfb7
+_md5_=0eaad24543c2ef432212489a75449c10
diff --git a/metadata/md5-cache/dev-libs/gjs-1.74.0 b/metadata/md5-cache/dev-libs/gjs-1.74.0
index ffddc3c58e5e..fec07daa5b41 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.74.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.74.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-102.2.0:102 cairo? ( x11-libs/cairo[X,glib,svg] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
+DEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-102.2.0:102 cairo? ( x11-libs/cairo[X,glib] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
 DESCRIPTION=Javascript bindings for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 INHERIT=flag-o-matic gnome.org meson virtualx
-IUSE=+cairo examples gtk readline sysprof test test
+IUSE=+cairo examples readline sysprof test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-102.2.0:102 cairo? ( x11-libs/cairo[X,glib,svg] ) readline? ( sys-libs/readline:0= )
+RDEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-102.2.0:102 cairo? ( x11-libs/cairo[X,glib] ) readline? ( sys-libs/readline:0= )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.74/gjs-1.74.0.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=4599dddd4beea7b562674f96edbfbe09
+_md5_=a3d80d12f4177fbb25fdb3e5839c4aed
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.9 b/metadata/md5-cache/dev-libs/leatherman-1.12.9
new file mode 100644
index 000000000000..bdc223406f4d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.9
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[nls] net-misc/curl
+DESCRIPTION=A C++ toolkit
+EAPI=7
+HOMEPAGE=https://github.com/puppetlabs/leatherman
+INHERIT=cmake
+IUSE=debug static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/boost:=[nls] net-misc/curl
+RESTRICT=test
+SLOT=0/1.12.9
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.9.tar.gz -> leatherman-1.12.9.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7b36a0d2dc9140180c8a92caa2f2e3ec
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.0.0 b/metadata/md5-cache/dev-libs/simdjson-3.0.0
new file mode 100644
index 000000000000..6a193a1723f1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/simdjson-3.0.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=tools? ( dev-libs/cxxopts:= )
+DESCRIPTION=SIMD accelerated C++ JSON library
+EAPI=8
+HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
+INHERIT=toolchain-funcs cmake
+IUSE=test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 Boost-1.0 BSD MIT
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/14
+SRC_URI=https://github.com/simdjson/simdjson/archive/v3.0.0.tar.gz -> simdjson-3.0.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-3.0.0.gh.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e2fdaf0fe7730de2d65605cd2ae17bc6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f13762b5002b..877985d20b0f 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/click-didyoumean-0.3.0 b/metadata/md5-cache/dev-python/click-didyoumean-0.3.0
new file mode 100644
index 000000000000..b16a13cb6136
--- /dev/null
+++ b/metadata/md5-cache/dev-python/click-didyoumean-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/click-7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[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=Enable git-like did-you-mean feature in click
+EAPI=8
+HOMEPAGE=https://github.com/click-contrib/click-didyoumean/ https://pypi.org/project/click-didyoumean/
+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
+LICENSE=MIT
+RDEPEND=>=dev-python/click-7[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/click-contrib/click-didyoumean/archive/v0.3.0.tar.gz -> click-didyoumean-0.3.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c163fdfc7c86b2e58c651af40d37c312
diff --git a/metadata/md5-cache/dev-python/ensurepip-pip-22.2.2 b/metadata/md5-cache/dev-python/ensurepip-pip-22.2.2
index 0f2716837a39..d292b927d7a5 100644
--- a/metadata/md5-cache/dev-python/ensurepip-pip-22.2.2
+++ b/metadata/md5-cache/dev-python/ensurepip-pip-22.2.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Shared pip wheel for ensurepip Python module
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pip/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
 RDEPEND=!<dev-python/ensurepip-wheels-100
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl
-_md5_=2e91fc16a5cc44cb3df4da7abba6ea33
+_md5_=f956f74b83ac7b60b6e9a8b88aedf191
diff --git a/metadata/md5-cache/dev-python/ensurepip-setuptools-65.0.2 b/metadata/md5-cache/dev-python/ensurepip-setuptools-65.0.2
deleted file mode 100644
index 7855a6f06264..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-setuptools-65.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared setuptools wheel for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!<dev-python/ensurepip-wheels-100
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-65.0.2-py3-none-any.whl
-_md5_=8535775f850047bf9c2ed16159f5c6a5
diff --git a/metadata/md5-cache/dev-python/ensurepip-setuptools-65.1.0 b/metadata/md5-cache/dev-python/ensurepip-setuptools-65.1.0
deleted file mode 100644
index 7636934c1900..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-setuptools-65.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared setuptools wheel for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!<dev-python/ensurepip-wheels-100
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-65.1.0-py3-none-any.whl
-_md5_=8535775f850047bf9c2ed16159f5c6a5
diff --git a/metadata/md5-cache/dev-python/ensurepip-setuptools-65.2.0 b/metadata/md5-cache/dev-python/ensurepip-setuptools-65.2.0
index f8abfe666b83..512c3ad97d99 100644
--- a/metadata/md5-cache/dev-python/ensurepip-setuptools-65.2.0
+++ b/metadata/md5-cache/dev-python/ensurepip-setuptools-65.2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Shared setuptools wheel for ensurepip Python module
 EAPI=8
 HOMEPAGE=https://pypi.org/project/setuptools/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=!<dev-python/ensurepip-wheels-100
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-65.2.0-py3-none-any.whl
-_md5_=6aab279d91e4cc954a6784110b19a3c6
+_md5_=72f9d609e391cec384034315b689760a
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-100 b/metadata/md5-cache/dev-python/ensurepip-wheels-100
index 1f8ab944979d..60644561fc69 100644
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-100
+++ b/metadata/md5-cache/dev-python/ensurepip-wheels-100
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Shared wheels for ensurepip Python module
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=metapackage
 RDEPEND=dev-python/ensurepip-pip dev-python/ensurepip-setuptools
 SLOT=0
-_md5_=ab4b3d891d34d0dcf8868729a4de7609
+_md5_=35c0b99cf3aa6231cc597dd4e0463703
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
deleted file mode 100644
index 41fc17830c71..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.3.22.2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared wheels for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.3-py3-none-any.whl
-_md5_=527f526d64326d70aacfe3c064f894b9
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-64.0.3.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-64.0.3.22.2.2
deleted file mode 100644
index d00117282904..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-wheels-64.0.3.22.2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared wheels for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-64.0.3-py3-none-any.whl
-_md5_=38599eac27c58e664ba46672b8e33827
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.14.2 b/metadata/md5-cache/dev-python/openapi-core-0.14.2
deleted file mode 100644
index 8c47c5dde7b6..000000000000
--- a/metadata/md5-cache/dev-python/openapi-core-0.14.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/djangorestframework[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webob[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dictpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-schema-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Client-side and server-side support for the OpenAPI Specification v3
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-core/ https://pypi.org/project/openapi-core/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dictpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-schema-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/openapi-core/archive/0.14.2.tar.gz -> openapi-core-0.14.2.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1038ba9a19c824eb1f9322d512a9697f
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.15.0 b/metadata/md5-cache/dev-python/openapi-core-0.15.0
deleted file mode 100644
index 6a1f6933c9dc..000000000000
--- a/metadata/md5-cache/dev-python/openapi-core-0.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webob[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Client-side and server-side support for the OpenAPI Specification v3
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-core/ https://pypi.org/project/openapi-core/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/pathable-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[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/p1c2u/openapi-core/archive/0.15.0.tar.gz -> openapi-core-0.15.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a3c78ee949341908d84c10272163810d
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.1 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.1
deleted file mode 100644
index 957d9af08d13..000000000000
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[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=OpenAPI schema validation for Python
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
-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 ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[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/p1c2u/openapi-schema-validator/archive/0.3.1.tar.gz -> openapi-schema-validator-0.3.1.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=03e2e7c65c1bedba82ef76d0a1a82639
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4
index 7427f7d6f76f..7ebaf3a54b37 100644
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4
+++ b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
 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 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/p1c2u/openapi-schema-validator/archive/0.3.4.tar.gz -> openapi-schema-validator-0.3.4.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5dc1127d97e19ce765d04b004101beb5
+_md5_=03e2e7c65c1bedba82ef76d0a1a82639
diff --git a/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.0-r1 b/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.0-r1
deleted file mode 100644
index 2133ee9df618..000000000000
--- a/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-5.8.0[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[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=OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-spec-validator/ https://pypi.org/project/openapi-spec-validator/
-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 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-5.8.0[python_targets_python3_8(-)?] ) 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/p1c2u/openapi-spec-validator/archive/0.5.0.tar.gz -> openapi-spec-validator-0.5.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a7d5d23bd1aa443c69ae07bebfa3e14b
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.10 b/metadata/md5-cache/dev-python/pygraphviz-1.10
index 6f324b13523a..ab0509694b66 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.10
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pygraphviz.github.io/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=media-gfx/graphviz python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.10.zip
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=57720798b057f01e494b699b71f814ba
+_md5_=157d45cff42a53ca790713c0f698436f
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.9 b/metadata/md5-cache/dev-python/pygraphviz-1.9
deleted file mode 100644
index e83996abd992..000000000000
--- a/metadata/md5-cache/dev-python/pygraphviz-1.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip dev-lang/swig:0 test? ( dev-python/doctest-ignore-unicode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( media-gfx/graphviz >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/graphviz
-DESCRIPTION=Python wrapper for the Graphviz Agraph data structure
-EAPI=8
-HOMEPAGE=https://pygraphviz.github.io/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=media-gfx/graphviz python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.9.zip
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=157d45cff42a53ca790713c0f698436f
diff --git a/metadata/md5-cache/dev-python/pytest-mpl-0.16.1 b/metadata/md5-cache/dev-python/pytest-mpl-0.16.1
new file mode 100644
index 000000000000..b15ec29c936e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-mpl-0.16.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Facilitate image comparison for Matplotlib figures
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-mpl/ https://github.com/matplotlib/pytest-mpl
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[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/p/pytest-mpl/pytest-mpl-0.16.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=82b35d49a17a191f0620c6472cf20bc3
diff --git a/metadata/md5-cache/dev-python/setuptools-65.4.0 b/metadata/md5-cache/dev-python/setuptools-65.4.0
deleted file mode 100644
index b6eedfc1ef8c..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-65.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[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(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-9[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=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-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 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-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/setuptools/setuptools-65.4.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=25c23f5427683573013ab5bae4bd9913
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 3e4bae565ad8..221a8188a276 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/tth-4.16 b/metadata/md5-cache/dev-tex/tth-4.16
new file mode 100644
index 000000000000..d62f743f70de
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/tth-4.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Translate TEX into HTML
+EAPI=8
+HOMEPAGE=http://hutchinson.belmont.ma.us/tth/
+INHERIT=flag-o-matic
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/ghostscript-gpl media-libs/netpbm
+SLOT=0
+SRC_URI=http://hutchinson.belmont.ma.us/tth/tth-noncom/tth_4.16.tgz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5bc70538085007c71f260f7f8f0d8d2b
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index f80d93a0449a..d26d1e601e7d 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-3.46.0 b/metadata/md5-cache/gnome-base/gnome-applets-3.46.0
new file mode 100644
index 000000000000..f85954ab6d88
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-applets-3.46.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.41.1 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-43.0:3 >=x11-libs/libnotify-0.7 >=sys-power/upower-0.99.8:= >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-4.2.0:4= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 ) >=x11-libs/pango-1.50.0 x11-base/xorg-proto
+DESCRIPTION=Applets for the GNOME Flashback Panel
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-applets/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+IUSE=tracker
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-2+ FDL-1.1
+RDEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.41.1 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-43.0:3 >=x11-libs/libnotify-0.7 >=sys-power/upower-0.99.8:= >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-4.2.0:4= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 ) >=x11-libs/pango-1.50.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-applets/3.46/gnome-applets-3.46.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=73e246910e4e094fb33ac28eb85db7c3
diff --git a/metadata/md5-cache/gnome-base/gnome-flashback-3.46.0 b/metadata/md5-cache/gnome-base/gnome-flashback-3.46.0
new file mode 100644
index 000000000000..b01a429c8bf4
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-flashback-3.46.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gdk-pixbuf-2.32.2:2 >=x11-libs/gtk+-3.22.0:3[X] >=gnome-base/gnome-desktop-43:3= >=gnome-base/gnome-panel-3.35.2 >=media-libs/libcanberra-0.13[gtk3] >=dev-libs/glib-2.67.3:2 >=gnome-base/gsettings-desktop-schemas-3.31.0 >=sys-auth/polkit-0.97 >=app-i18n/ibus-1.5.2 >=sys-power/upower-0.99.0:= >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXxf86vm-1.1.4 x11-libs/libxcb:= x11-libs/libX11 gnome-base/gdm elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) net-wireless/gnome-bluetooth:3= x11-libs/libXext >=x11-libs/libXi-1.6.0 x11-libs/pango x11-libs/libxkbfile x11-misc/xkeyboard-config x11-libs/libXfixes media-libs/libpulse[glib] media-libs/alsa-lib sys-libs/pam x11-base/xorg-proto
+DESCRIPTION=GNOME Flashback session
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-flashback/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 toolchain-funcs
+IUSE=elogind systemd
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-3+
+RDEPEND=>=x11-libs/gdk-pixbuf-2.32.2:2 >=x11-libs/gtk+-3.22.0:3[X] >=gnome-base/gnome-desktop-43:3= >=gnome-base/gnome-panel-3.35.2 >=media-libs/libcanberra-0.13[gtk3] >=dev-libs/glib-2.67.3:2 >=gnome-base/gsettings-desktop-schemas-3.31.0 >=sys-auth/polkit-0.97 >=app-i18n/ibus-1.5.2 >=sys-power/upower-0.99.0:= >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXxf86vm-1.1.4 x11-libs/libxcb:= x11-libs/libX11 gnome-base/gdm elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) net-wireless/gnome-bluetooth:3= x11-libs/libXext >=x11-libs/libXi-1.6.0 x11-libs/pango x11-libs/libxkbfile x11-misc/xkeyboard-config x11-libs/libXfixes media-libs/libpulse[glib] media-libs/alsa-lib sys-libs/pam x11-wm/metacity gnome-base/gnome-panel gnome-base/gnome-settings-daemon
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-flashback/3.46/gnome-flashback-3.46.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6c2d5bed8b5b85d58f844b8423503836
diff --git a/metadata/md5-cache/gnome-base/gnome-panel-3.44.0-r1 b/metadata/md5-cache/gnome-base/gnome-panel-3.44.0-r2
index 4c64b0191f48..5c777da78183 100644
--- a/metadata/md5-cache/gnome-base/gnome-panel-3.44.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-panel-3.44.0-r2
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-panel/3.44/gnome-panel-3.44.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4db96ce7ede0dc4c4aac9f150400b18a
+_md5_=fc5666185066c6eccba9554e96bd5b21
diff --git a/metadata/md5-cache/gnome-base/gnome-panel-3.46.0 b/metadata/md5-cache/gnome-base/gnome-panel-3.46.0
new file mode 100644
index 000000000000..4c738c030bea
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-panel-3.46.0
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=gnome-base/gnome-desktop-2.91.0:3= >=x11-libs/gdk-pixbuf-2.26.0:2 >=x11-libs/pango-1.15.4 >=dev-libs/glib-2.67.1:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/libwnck-43.0:3 >=gnome-base/gnome-menus-3.7.90:3 eds? ( >=gnome-extra/evolution-data-server-3.46.0:= ) elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) >=x11-libs/cairo-1.0.0[X,glib] >=dev-libs/libgweather-4.2.0:4= >=gnome-base/dconf-0.13.4 >=x11-libs/libXrandr-1.3.0 gnome-base/gdm x11-libs/libX11 x11-libs/libXi sci-geosciences/geocode-glib:2 sys-auth/polkit x11-base/xorg-proto
+DESCRIPTION=The GNOME Flashback Panel
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-panel/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 toolchain-funcs
+IUSE=eds elogind systemd
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-2+ FDL-1.1 LGPL-2.1+
+RDEPEND=>=gnome-base/gnome-desktop-2.91.0:3= >=x11-libs/gdk-pixbuf-2.26.0:2 >=x11-libs/pango-1.15.4 >=dev-libs/glib-2.67.1:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/libwnck-43.0:3 >=gnome-base/gnome-menus-3.7.90:3 eds? ( >=gnome-extra/evolution-data-server-3.46.0:= ) elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) >=x11-libs/cairo-1.0.0[X,glib] >=dev-libs/libgweather-4.2.0:4= >=gnome-base/dconf-0.13.4 >=x11-libs/libXrandr-1.3.0 gnome-base/gdm x11-libs/libX11 x11-libs/libXi sci-geosciences/geocode-glib:2 sys-auth/polkit
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-panel/3.46/gnome-panel-3.46.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7eae2021164441d01778d2c417b3e91a
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 52cb07e83994..bbc9b8d5de57 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r4
index 5e76de79e172..d793d00f7dc4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r4
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r4
@@ -7,7 +7,7 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm plasma.kde.org
 IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.25.5:5
 RDEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5[widgets] >=dev-qt/qtgui-5.15.5:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwayland-5.15.5:5= >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kactivities-5.95.0:5 >=kde-frameworks/kactivities-stats-5.95.0:5 >=kde-frameworks/karchive-5.95.0:5 >=kde-frameworks/kauth-5.95.0:5 >=kde-frameworks/kbookmarks-5.95.0:5 >=kde-frameworks/kcompletion-5.95.0:5 >=kde-frameworks/kconfig-5.95.0:5 >=kde-frameworks/kconfigwidgets-5.95.0:5 >=kde-frameworks/kcoreaddons-5.95.0:5 >=kde-frameworks/kcrash-5.95.0:5 >=kde-frameworks/kdbusaddons-5.95.0:5 >=kde-frameworks/kdeclarative-5.95.0:5 >=kde-frameworks/kded-5.95.0:5 >=kde-frameworks/kglobalaccel-5.95.0:5 >=kde-frameworks/kguiaddons-5.95.0:5 >=kde-frameworks/ki18n-5.95.0:5 >=kde-frameworks/kiconthemes-5.95.0:5 >=kde-frameworks/kidletime-5.95.0:5 >=kde-frameworks/kinit-5.95.0:5 >=kde-frameworks/kio-5.95.0:5 >=kde-frameworks/kitemmodels-5.95.0:5 >=kde-frameworks/kitemviews-5.95.0:5 >=kde-frameworks/kjobwidgets-5.95.0:5 >=kde-frameworks/knewstuff-5.95.0:5 >=kde-frameworks/knotifications-5.95.0:5 >=kde-frameworks/knotifyconfig-5.95.0:5 >=kde-frameworks/kpackage-5.95.0:5 >=kde-frameworks/kpeople-5.95.0:5 >=kde-frameworks/krunner-5.95.0:5 >=kde-frameworks/kservice-5.95.0:5 >=kde-frameworks/ktexteditor-5.95.0:5 >=kde-frameworks/ktextwidgets-5.95.0:5 >=kde-frameworks/kunitconversion-5.95.0:5 >=kde-frameworks/kwallet-5.95.0:5 >=kde-frameworks/kwayland-5.95.0:5 >=kde-frameworks/kwidgetsaddons-5.95.0:5 >=kde-frameworks/kwindowsystem-5.95.0:5 >=kde-frameworks/kxmlgui-5.95.0:5 >=kde-frameworks/plasma-5.95.0:5 >=kde-frameworks/prison-5.95.0:5[qml] >=kde-frameworks/solid-5.95.0:5 >=kde-plasma/breeze-5.25.5:5 >=kde-plasma/kscreenlocker-5.25.5:5 >=kde-plasma/kwin-5.25.5:5 >=kde-plasma/layer-shell-qt-5.25.5:5 >=kde-plasma/libkscreen-5.25.5:5 >=kde-plasma/libksysguard-5.25.5:5 >=kde-plasma/libkworkspace-5.25.5:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.95.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.5:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.95.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.5:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.95.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.5:* >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtpaths-5.15.5:5 >=dev-qt/qtquickcontrols-5.15.5:5[widgets] >=dev-qt/qtquickcontrols2-5.15.5:5 kde-apps/kio-extras:5 >=kde-frameworks/kirigami-5.95.0:5 >=kde-frameworks/kquickcharts-5.95.0:5 >=kde-plasma/milou-5.25.5:5 >=kde-plasma/plasma-integration-5.25.5:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.23.90:5 policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -16,4 +16,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.25.5/plasma-workspace-5.25.5.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=458c8bd6ed45ff9889bc5c881484b3c7
+_md5_=89c054db455345c13917204fd9267e79
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 79ea24456162..e86d5b554f26 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/gnome-photos-43.0 b/metadata/md5-cache/media-gfx/gnome-photos-43.0
new file mode 100644
index 000000000000..70775b22b64d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gnome-photos-43.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxslt app-text/docbook-xsl-stylesheets dev-util/desktop-file-utils dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-util/dogtail[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-util/dogtail[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/dogtail[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/dogtail[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/babl >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36.8:2 >=media-libs/gegl-0.4.0:0.4[cairo,raw] sci-geosciences/geocode-glib:2 >=media-libs/gexiv2-0.14.0 >=dev-libs/glib-2.62.0:2 dev-libs/libportal:=[gtk] >=net-libs/gnome-online-accounts-3.8.0:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.16:3 >=dev-libs/libdazzle-3.26.0 >=gui-libs/libhandy-1.1.90:1 media-libs/libjpeg-turbo:0= >=media-libs/libpng-1.6:0= app-misc/tracker:3 sys-apps/dbus
+DESCRIPTION=Access, organize and share your photos on GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Photos
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+IUSE=test upnp-av test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+ LGPL-2+ CC0-1.0
+RDEPEND=media-libs/babl >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36.8:2 >=media-libs/gegl-0.4.0:0.4[cairo,raw] sci-geosciences/geocode-glib:2 >=media-libs/gexiv2-0.14.0 >=dev-libs/glib-2.62.0:2 dev-libs/libportal:=[gtk] >=net-libs/gnome-online-accounts-3.8.0:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.16:3 >=dev-libs/libdazzle-3.26.0 >=gui-libs/libhandy-1.1.90:1 media-libs/libjpeg-turbo:0= >=media-libs/libpng-1.6:0= app-misc/tracker:3 sys-apps/dbus net-misc/gnome-online-miners upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) app-misc/tracker-miners:3
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-photos/43/gnome-photos-43.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b23e970158d9e53634d1da430d475306
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7b47a408f9d2..cb9557a8258c 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/flac-1.4.1 b/metadata/md5-cache/media-libs/flac-1.4.1
index b19340b9be38..f221a3001314 100644
--- a/metadata/md5-cache/media-libs/flac-1.4.1
+++ b/metadata/md5-cache/media-libs/flac-1.4.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xiph.org/flac/
 INHERIT=multilib-minimal
 IUSE=+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx cpu_flags_x86_sse2 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
 SLOT=0/10-12
 SRC_URI=https://downloads.xiph.org/releases/flac/flac-1.4.1.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bf5a94bbda92b76cf5f53cd97d178edb
+_md5_=e853fc15883960157f75587d75021889
diff --git a/metadata/md5-cache/media-libs/flac-compat-1.3.4 b/metadata/md5-cache/media-libs/flac-compat-1.3.4
index 3c5799a74bd4..53f64a07a146 100644
--- a/metadata/md5-cache/media-libs/flac-compat-1.3.4
+++ b/metadata/md5-cache/media-libs/flac-compat-1.3.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xiph.org/flac/
 INHERIT=multilib-minimal
 IUSE=+cxx ogg cpu_flags_x86_sse 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 x86
+KEYWORDS=amd64 arm x86
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=!media-libs/flac:0/0 ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=8.3.0
 SRC_URI=https://downloads.xiph.org/releases/flac/flac-1.3.4.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=09dcdb5f43aa645e68ad29708b888183
+_md5_=9221e35d5a48be7e8e0b2d818ef25ceb
diff --git a/metadata/md5-cache/media-libs/librtprocess-0.12.0 b/metadata/md5-cache/media-libs/librtprocess-0.12.0
index e3e9b8867df7..d3dc28ddd6b8 100644
--- a/metadata/md5-cache/media-libs/librtprocess-0.12.0
+++ b/metadata/md5-cache/media-libs/librtprocess-0.12.0
@@ -4,9 +4,9 @@ DESCRIPTION=Algorithms for RAW processing from RawTherapee
 EAPI=8
 HOMEPAGE=https://github.com/CarVac/librtprocess/
 INHERIT=cmake
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/CarVac/librtprocess/archive/refs/tags/0.12.0.tar.gz -> librtprocess-0.12.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b3291cf35b328e573d85b11a2b0ee6b7
+_md5_=5643df3c0a74ce5d1205d2ee604aec26
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index dec888671b43..38ac15c36d0c 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/transmission-4.0.0_beta1 b/metadata/md5-cache/net-p2p/transmission-4.0.0_beta1
new file mode 100644
index 000000000000..6be75c55b8fc
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/transmission-4.0.0_beta1
@@ -0,0 +1,15 @@
+BDEPEND=acct-group/transmission acct-user/transmission virtual/pkgconfig nls? ( gtk? ( sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/libevent-2.1.0:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
+DESCRIPTION=A fast, easy, and free BitTorrent client
+EAPI=7
+HOMEPAGE=https://transmissionbt.com/
+INHERIT=cmake systemd xdg-utils
+IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test web
+LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
+RDEPEND=>=dev-libs/libevent-2.1.0:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/transmission/transmission/releases/download/4.0.0-beta.1/transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ffbf0165e634c92efad746b8fbe9297f
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 22a0a43b8140..5666c9b3b78d 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -1,6 +1,6 @@
 BDEPEND=acct-group/transmission acct-user/transmission virtual/pkgconfig nls? ( gtk? ( sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.50.1:2 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
+DEPEND=>=dev-libs/libevent-2.1.0:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=7
 HOMEPAGE=https://transmissionbt.com/
@@ -8,8 +8,8 @@ INHERIT=cmake systemd xdg-utils git-r3
 IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test web
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.50.1:2 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
+RDEPEND=>=dev-libs/libevent-2.1.0:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e913c8533b32e4b81c162a421502523d
+_md5_=ffbf0165e634c92efad746b8fbe9297f
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 0d58dfa96ff0..516c76a21d23 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/pysiril-0.0.12 b/metadata/md5-cache/sci-astronomy/pysiril-0.0.12
index eb01b34e9356..fc0adf555daa 100644
--- a/metadata/md5-cache/sci-astronomy/pysiril-0.0.12
+++ b/metadata/md5-cache/sci-astronomy/pysiril-0.0.12
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/pysiril
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=sci-astronomy/siril 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=https://gitlab.com/free-astro/pysiril/-/archive/V0_0_12/pysiril-V0_0_12.tar.bz2
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6312a9480c25a97fcdd2fb7a2efcaa52
+_md5_=0fb07564cc0d312416921aeb9e4acae3
diff --git a/metadata/md5-cache/sci-astronomy/siril-1.0.3 b/metadata/md5-cache/sci-astronomy/siril-1.0.3
index e00cec07fbfc..181698be4836 100644
--- a/metadata/md5-cache/sci-astronomy/siril-1.0.3
+++ b/metadata/md5-cache/sci-astronomy/siril-1.0.3
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.siril.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson optfeature toolchain-funcs xdg
 IUSE=curl ffmpeg heif jpeg openmp png raw tiff wcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ Boost-1.0
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig-1.4[cxx] >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff ) wcs? ( >=sci-astronomy/wcslib-7.7 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/siril/-/archive/1.0.3/siril-1.0.3.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1f3673e5245112b4ded9dd38f0a61ba4
+_md5_=76f134f912c74c8368063a44d3d35c49
diff --git a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3 b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3
index ecc4189dd179..94755ab5c52c 100644
--- a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3
+++ b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/sirilic
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/wxpython:4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/sirilic/-/archive/V1_14_3/sirilic-V1_14_3.tar.bz2
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b2a398c947db245d616e6c0b9883c686
+_md5_=00534375c8e6311e81369036c3fd2fa4
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 7e1cce58e1f5..6255e0cb9bfb 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/xsv-0.13.0 b/metadata/md5-cache/sci-calculators/xsv-0.13.0
index 5b9f7a9ca7a4..4c861d672523 100644
--- a/metadata/md5-cache/sci-calculators/xsv-0.13.0
+++ b/metadata/md5-cache/sci-calculators/xsv-0.13.0
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/BurntSushi/xsv
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( MIT Unlicense ) Apache-2.0 Boost-1.0 MIT Unlicense
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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/chan/0.1.23/download -> chan-0.1.23.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv-index/0.1.6/download -> csv-index-0.1.6.crate https://crates.io/api/v1/crates/docopt/1.1.1/download -> docopt-1.1.1.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.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/itoa/0.4.7/download -> itoa-0.4.7.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.97/download -> libc-0.2.97.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.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/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quickcheck/0.6.2/download -> quickcheck-0.6.2.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.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/streaming-stats/0.2.3/download -> streaming-stats-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/tabwriter/1.2.1/download -> tabwriter-1.2.1.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.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.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://github.com/BurntSushi/xsv/archive/refs/tags/0.13.0.tar.gz -> xsv-0.13.0.tar.gz
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ceb1a9cf8b5fad3c47cc20f0c3563a72
+_md5_=2a1fd662b23ae8d27db6f1e0482b8b32
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 923ecfa0312a..ff6dc806cd10 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18427 b/metadata/md5-cache/sci-geosciences/josm-bin-18565
index 66f6e40c9d79..3cec88487ec5 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18427
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18565
@@ -5,10 +5,10 @@ DESCRIPTION=Java-based editor for the OpenStreetMap project
 EAPI=7
 HOMEPAGE=https://josm.openstreetmap.de/
 INHERIT=desktop java-utils-2 xdg
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 GPL-2+ GPL-3
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
-SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18427.jar
+SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18565.jar
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c6bc17c4ab8ebfdf972371113ca64dcc
+_md5_=73793bcbad5bb561c3b5db53c31d00e6
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 79d43179b5c4..e8501b2bfa9a 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.20.1-r1 b/metadata/md5-cache/sci-libs/cartopy-0.20.1-r1
deleted file mode 100644
index 581f2069f6b0..000000000000
--- a/metadata/md5-cache/sci-libs/cartopy-0.20.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( 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 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flufl-lock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python package for geospatial data processing and analysis
-EAPI=8
-HOMEPAGE=https://scitools.org.uk/cartopy
-INHERIT=distutils-r1 virtualx
-IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SciTools/cartopy/archive/v0.20.1.tar.gz -> cartopy-0.20.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0f93fa456e7db0bb034ac8cde240b58a
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.20.2 b/metadata/md5-cache/sci-libs/cartopy-0.20.2
deleted file mode 100644
index a89f1a9ff4ca..000000000000
--- a/metadata/md5-cache/sci-libs/cartopy-0.20.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( 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 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flufl-lock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python package for geospatial data processing and analysis
-EAPI=8
-HOMEPAGE=https://scitools.org.uk/cartopy
-INHERIT=distutils-r1 virtualx
-IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SciTools/cartopy/archive/v0.20.2.tar.gz -> cartopy-0.20.2.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0f93fa456e7db0bb034ac8cde240b58a
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.20.3 b/metadata/md5-cache/sci-libs/cartopy-0.20.3
deleted file mode 100644
index 40ae0f44f925..000000000000
--- a/metadata/md5-cache/sci-libs/cartopy-0.20.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( 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 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flufl-lock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python package for geospatial data processing and analysis
-EAPI=8
-HOMEPAGE=https://scitools.org.uk/cartopy
-INHERIT=distutils-r1 virtualx
-IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/proj-8 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SciTools/cartopy/archive/v0.20.3.tar.gz -> cartopy-0.20.3.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=97d5deea4db956d3604cd67d4ee15ae4
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.20.3-r2 b/metadata/md5-cache/sci-libs/cartopy-0.20.3-r2
new file mode 100644
index 000000000000..848bd7ffbb68
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cartopy-0.20.3-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)] dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools_scm_git_archive[python_targets_python3_9(-)] dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools_scm_git_archive[python_targets_python3_10(-)] dev-python/cython[python_targets_python3_10(-)] ) test? ( python_single_target_python3_8? ( dev-python/filelock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/flufl-lock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/filelock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/flufl-lock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/filelock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] dev-python/flufl-lock[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos >=sci-libs/proj-8 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/shapely[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] <dev-python/matplotlib-3.6[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] dev-python/pillow[jpeg,python_targets_python3_8(-)] dev-python/pyproj[python_targets_python3_8(-)] sci-libs/gdal[python,python_targets_python3_8(-)] sci-libs/pyshp[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] <dev-python/matplotlib-3.6[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/gdal[python,python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] <dev-python/matplotlib-3.6[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/gdal[python,python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos >=sci-libs/proj-8 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/shapely[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] <dev-python/matplotlib-3.6[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] dev-python/pillow[jpeg,python_targets_python3_8(-)] dev-python/pyproj[python_targets_python3_8(-)] sci-libs/gdal[python,python_targets_python3_8(-)] sci-libs/pyshp[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] <dev-python/matplotlib-3.6[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/gdal[python,python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] <dev-python/matplotlib-3.6[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/gdal[python,python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] )
+DESCRIPTION=Python package for geospatial data processing and analysis
+EAPI=8
+HOMEPAGE=https://scitools.org.uk/cartopy
+INHERIT=distutils-r1 virtualx
+IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos >=sci-libs/proj-8 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/shapely[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] <dev-python/matplotlib-3.6[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] dev-python/pillow[jpeg,python_targets_python3_8(-)] dev-python/pyproj[python_targets_python3_8(-)] sci-libs/gdal[python,python_targets_python3_8(-)] sci-libs/pyshp[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] <dev-python/matplotlib-3.6[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/gdal[python,python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] <dev-python/matplotlib-3.6[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/gdal[python,python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SciTools/cartopy/archive/v0.20.3.tar.gz -> cartopy-0.20.3.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=772f321d425a074da2fbe764fda60338
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.21.0 b/metadata/md5-cache/sci-libs/cartopy-0.21.0
new file mode 100644
index 000000000000..a286011eb685
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cartopy-0.21.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)] dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools_scm_git_archive[python_targets_python3_9(-)] dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools_scm_git_archive[python_targets_python3_10(-)] dev-python/cython[python_targets_python3_10(-)] ) test? ( python_single_target_python3_8? ( dev-python/filelock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/flufl-lock[python_targets_python3_8(-)] dev-python/pytest-mpl[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/filelock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/flufl-lock[python_targets_python3_9(-)] dev-python/pytest-mpl[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/filelock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] dev-python/flufl-lock[python_targets_python3_10(-)] dev-python/pytest-mpl[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos python_single_target_python3_8? ( >=dev-python/numpy-1.19[python_targets_python3_8(-)] dev-python/shapely[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] dev-python/pillow[jpeg,python_targets_python3_8(-)] dev-python/pyproj[python_targets_python3_8(-)] sci-libs/gdal[python,python_targets_python3_8(-)] sci-libs/pyshp[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/gdal[python,python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/gdal[python,python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos python_single_target_python3_8? ( >=dev-python/numpy-1.19[python_targets_python3_8(-)] dev-python/shapely[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] dev-python/pillow[jpeg,python_targets_python3_8(-)] dev-python/pyproj[python_targets_python3_8(-)] sci-libs/gdal[python,python_targets_python3_8(-)] sci-libs/pyshp[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/gdal[python,python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/gdal[python,python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] )
+DESCRIPTION=Python package for geospatial data processing and analysis
+EAPI=8
+HOMEPAGE=https://scitools.org.uk/cartopy
+INHERIT=distutils-r1 multiprocessing virtualx
+IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sci-libs/geos python_single_target_python3_8? ( >=dev-python/numpy-1.19[python_targets_python3_8(-)] dev-python/shapely[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] dev-python/pillow[jpeg,python_targets_python3_8(-)] dev-python/pyproj[python_targets_python3_8(-)] sci-libs/gdal[python,python_targets_python3_8(-)] sci-libs/pyshp[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/gdal[python,python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/gdal[python,python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SciTools/cartopy/archive/v0.21.0.tar.gz -> cartopy-0.21.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=cfe4671fb037ef8ffd40d0502d95eecd
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 8544c7640466..2466555437d1 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.30 b/metadata/md5-cache/sci-visualization/pythonprop-0.30-r1
index c1e362b7bb23..9ab5ba0c9027 100644
--- a/metadata/md5-cache/sci-visualization/pythonprop-0.30
+++ b/metadata/md5-cache/sci-visualization/pythonprop-0.30-r1
@@ -1,6 +1,6 @@
 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=install prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] sci-libs/cartopy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] sci-libs/cartopy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-electronics/voacapl app-text/yelp-tools app-text/rarian
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-electronics/voacapl app-text/yelp-tools app-text/rarian
 DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
 EAPI=7
 HOMEPAGE=https://www.qsl.net/h/hz1jw/pythonprop
@@ -8,9 +8,9 @@ INHERIT=autotools python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] sci-libs/cartopy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] sci-libs/cartopy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-electronics/voacapl
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-electronics/voacapl
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jawatson/pythonprop/archive/v0.30.tar.gz -> pythonprop-0.30.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c93a086709a3cd91d9949aa3ca1a5806
+_md5_=5742f1635869f46baa2571e1a7171d83
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 8bb19c2ed2ac..d5fcd93c49e0 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-2.1.5 b/metadata/md5-cache/sys-fs/mtd-utils-2.1.5
new file mode 100644
index 000000000000..88aed46c5c72
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtd-utils-2.1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-apps/util-linux:= sys-libs/zlib:= lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
+EAPI=8
+HOMEPAGE=https://git.infradead.org/?p=mtd-utils.git;a=summary
+IUSE=+lzo xattr +zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-linux:= sys-libs/zlib:= lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd:= )
+SLOT=0
+SRC_URI=https://infraroot.at/pub/mtd/mtd-utils-2.1.5.tar.bz2
+_md5_=e93c91d7b073695af414da5591a1c9c1
diff --git a/metadata/md5-cache/sys-fs/squashfuse-0.1.105 b/metadata/md5-cache/sys-fs/squashfuse-0.1.105
new file mode 100644
index 000000000000..e840aff708b4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfuse-0.1.105
@@ -0,0 +1,17 @@
+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
+DEPEND=>=sys-fs/fuse-2.8.6:0= lzma? ( >=app-arch/xz-utils-5.0.4:= ) zlib? ( >=sys-libs/zlib-1.2.5-r2:= ) lzo? ( >=dev-libs/lzo-2.06:= ) lz4? ( >=app-arch/lz4-0_p106:= ) zstd? ( app-arch/zstd:= ) virtual/pkgconfig
+DESCRIPTION=FUSE filesystem to mount squashfs archives
+EAPI=7
+HOMEPAGE=https://github.com/vasi/squashfuse
+INHERIT=autotools flag-o-matic
+IUSE=lz4 lzma lzo static-libs +zlib zstd
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=sys-fs/fuse-2.8.6:0= lzma? ( >=app-arch/xz-utils-5.0.4:= ) zlib? ( >=sys-libs/zlib-1.2.5-r2:= ) lzo? ( >=dev-libs/lzo-2.06:= ) lz4? ( >=app-arch/lz4-0_p106:= ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=|| ( lz4 lzma lzo zlib zstd )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vasi/squashfuse/releases/download/0.1.105/squashfuse-0.1.105.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_=96aac43b391879e00c9edaa563095535
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f38c6030c2be..d45aab7e94f0 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/minizip-ng-3.0.6-r1 b/metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1
index ce1af116661c..b6dd50a30bcf 100644
--- a/metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1
+++ b/metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zlib-ng/minizip-ng/archive/refs/tags/3.0.6.tar.gz -> minizip-ng-3.0.6.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=47ac935136359f67c057a2a13f87a959
+_md5_=865f84c112cd13e00529c9b9283f0693
diff --git a/metadata/md5-cache/sys-libs/zlib-ng-2.0.6 b/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
index 4ff252f4a75e..c71f40507e2b 100644
--- a/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
+++ b/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zlib-ng/zlib-ng/archive/2.0.6.tar.gz -> zlib-ng-2.0.6.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=07654b45e3e8e8336d7100c34dba7d38
+_md5_=62bec376fb2f149f90d16be3a09a1251
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 9a94cfae64af..d69e6c0c7c96 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/btop-1.2.12 b/metadata/md5-cache/sys-process/btop-1.2.12
new file mode 100644
index 000000000000..0bba325b21bc
--- /dev/null
+++ b/metadata/md5-cache/sys-process/btop-1.2.12
@@ -0,0 +1,12 @@
+BDEPEND=>=sys-devel/gcc-8
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DESCRIPTION=A monitor of resources
+EAPI=8
+HOMEPAGE=https://github.com/aristocratos/btop
+INHERIT=toolchain-funcs xdg-utils
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/aristocratos/btop/archive/refs/tags/v1.2.12.tar.gz -> btop-1.2.12.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3b41842c76fbedd28a56877072d4e7b3
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index e8543088457f..c5de667750e7 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/blohg-0.13-r4 b/metadata/md5-cache/www-apps/blohg-0.13-r4
deleted file mode 100644
index 0a4bffa6b6f3..000000000000
--- a/metadata/md5-cache/www-apps/blohg-0.13-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/click[python_targets_python3_8(-)?] dev-python/docutils[python_targets_python3_8(-)?] dev-python/feedgenerator[python_targets_python3_8(-)?] dev-python/flask[python_targets_python3_8(-)?] dev-python/flask-babel[python_targets_python3_8(-)?] dev-python/Frozen-Flask[python_targets_python3_8(-)?] dev-python/jinja[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/pygments[python_targets_python3_8(-)?] git? ( dev-python/pygit2[python_targets_python3_8(-)?] ) mercurial? ( >=dev-vcs/mercurial-5.2[python_targets_python3_8(-)?] ) doc? ( dev-python/sphinx )
-DESCRIPTION=A Mercurial (or Git) based blogging engine
-EAPI=7
-HOMEPAGE=https://github.com/rafaelmartins/blohg
-INHERIT=distutils-r1
-IUSE=doc git +mercurial test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/click[python_targets_python3_8(-)?] dev-python/docutils[python_targets_python3_8(-)?] dev-python/feedgenerator[python_targets_python3_8(-)?] dev-python/flask[python_targets_python3_8(-)?] dev-python/flask-babel[python_targets_python3_8(-)?] dev-python/Frozen-Flask[python_targets_python3_8(-)?] dev-python/jinja[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/pygments[python_targets_python3_8(-)?] git? ( dev-python/pygit2[python_targets_python3_8(-)?] ) mercurial? ( >=dev-vcs/mercurial-5.2[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 )
-REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/blohg/blohg-0.13.tar.gz https://dev.gentoo.org/~rafaelmartins/distfiles/blohg-patches-0.13-r4.tar.xz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ed6dbd78d57c872aa522097ab4ff63d
diff --git a/metadata/md5-cache/www-apps/blohg-9999 b/metadata/md5-cache/www-apps/blohg-9999
deleted file mode 100644
index 98a196a2bf21..000000000000
--- a/metadata/md5-cache/www-apps/blohg-9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/click[python_targets_python3_8(-)?] dev-python/docutils[python_targets_python3_8(-)?] dev-python/feedgenerator[python_targets_python3_8(-)?] dev-python/flask[python_targets_python3_8(-)?] dev-python/flask-babel[python_targets_python3_8(-)?] dev-python/Frozen-Flask[python_targets_python3_8(-)?] dev-python/jinja[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/pygments[python_targets_python3_8(-)?] git? ( dev-python/pygit2[python_targets_python3_8(-)?] ) mercurial? ( >=dev-vcs/mercurial-5.2[python_targets_python3_8(-)?] ) doc? ( dev-python/sphinx )
-DESCRIPTION=A Mercurial (or Git) based blogging engine
-EAPI=7
-HOMEPAGE=https://github.com/rafaelmartins/blohg
-INHERIT=distutils-r1 git-r3
-IUSE=doc git +mercurial test python_targets_python3_8
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=dev-python/click[python_targets_python3_8(-)?] dev-python/docutils[python_targets_python3_8(-)?] dev-python/feedgenerator[python_targets_python3_8(-)?] dev-python/flask[python_targets_python3_8(-)?] dev-python/flask-babel[python_targets_python3_8(-)?] dev-python/Frozen-Flask[python_targets_python3_8(-)?] dev-python/jinja[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/pygments[python_targets_python3_8(-)?] git? ( dev-python/pygit2[python_targets_python3_8(-)?] ) mercurial? ( >=dev-vcs/mercurial-5.2[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 )
-REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ed6dbd78d57c872aa522097ab4ff63d
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index ab123e37a2aa..9d8f9b9ed48e 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-bin-106.0.5249.103 b/metadata/md5-cache/www-client/chromium-bin-106.0.5249.103
index cd4fdfeda7ed..569236f21d4e 100644
--- a/metadata/md5-cache/www-client/chromium-bin-106.0.5249.103
+++ b/metadata/md5-cache/www-client/chromium-bin-106.0.5249.103
@@ -7,7 +7,7 @@ IUSE=cpu_flags_x86_sse2 +suid wayland widevine +l10n_af +l10n_am +l10n_ar +l10n_
 KEYWORDS=-* amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 ) media-libs/fontconfig >=media-libs/freetype-2.11.0-r1 media-libs/libjpeg-turbo media-libs/libwebp media-libs/mesa[gbm(+)] media-libs/openh264:0/6.1 net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/pciutils >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 sys-libs/zlib[minizip] virtual/ttf-fonts virtual/udev x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils amd64? ( widevine? ( www-plugins/chrome-binary-plugins ) ) wayland? ( dev-libs/wayland )
-SLOT=0
+SLOT=0/stable
 SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.103-1-x11-i686.tar.xz ) )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cc6cd8fb8d966ce0dfdd6896d1e58b1e
+_md5_=c3a14483d08f1df5b4eb93f2c8983d75
diff --git a/metadata/md5-cache/www-client/chromium-bin-107.0.5304.29 b/metadata/md5-cache/www-client/chromium-bin-107.0.5304.29
new file mode 100644
index 000000000000..23c48adf2717
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-bin-107.0.5304.29
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm pretend setup unpack
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+INHERIT=chromium-2 desktop pax-utils readme.gentoo-r1 unpacker xdg-utils
+IUSE=cpu_flags_x86_sse2 +suid wayland widevine +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=BSD
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/flac:0/10-12 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1 media-libs/libjpeg-turbo media-libs/libwebp media-libs/mesa[gbm(+)] media-libs/openh264:0/6.1 net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/pciutils >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 sys-libs/zlib[minizip] virtual/ttf-fonts virtual/udev x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils amd64? ( widevine? ( www-plugins/chrome-binary-plugins ) ) wayland? ( dev-libs/wayland )
+SLOT=0/beta
+SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-107.0.5304.29-1-x11-i686.tar.xz ) )
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=19516c09fdd903c0e9db2a7ea6ba8da6
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 8126c3fe6571..7dc19f353ebd 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/cairo-1.16.0-r5 b/metadata/md5-cache/x11-libs/cairo-1.16.0-r6
index 2c119f366ff6..5921b134ee59 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.16.0-r5
+++ b/metadata/md5-cache/x11-libs/cairo-1.16.0-r6
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.cairographics.org/releases/cairo-1.16.0.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=56c46c77463512b1fe94c5d5a8da7297
+_md5_=87a94e2de4381a8ac59aa118d1950575
diff --git a/metadata/md5-cache/x11-libs/cairo-1.17.6 b/metadata/md5-cache/x11-libs/cairo-1.17.6
new file mode 100644
index 000000000000..8c027a54adb5
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/cairo-1.17.6
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/lzo-2.06-r1: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(-)?] >=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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10: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/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(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs: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(-)?] ) gles2-only? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A vector graphics library with cross-device output support
+EAPI=8
+HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
+INHERIT=meson-multilib
+IUSE=X aqua debug gles2-only gles3 +glib gtk-doc opengl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-2.1 MPL-1.1 )
+RDEPEND=>=dev-libs/lzo-2.06-r1: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(-)?] >=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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10: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/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(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs: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(-)?] ) gles2-only? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=gles2-only? ( !opengl ) gles3? ( gles2-only )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.6/cairo-1.17.6.tar.bz2
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=17a20f3c86a085f4559d11151ec8430d
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index f4b6844cd54c..43a9efdec63a 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig >=sys-devel/libtool-2 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=compile configure install prepare test unpack
-DEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10: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/binutils-libs: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/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(-)?] >=x11-libs/pixman-0.36.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(-)?] gles2-only? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-libs/lzo-2.06-r1: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(-)?] >=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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10: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/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(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs: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(-)?] ) gles2-only? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
 DESCRIPTION=A vector graphics library with cross-device output support
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
-INHERIT=flag-o-matic autotools multilib-minimal git-r3
-IUSE=X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+INHERIT=meson-multilib git-r3
+IUSE=X aqua debug gles2-only gles3 +glib gtk-doc opengl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 PROPERTIES=live
-RDEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10: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/binutils-libs: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/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(-)?] >=x11-libs/pixman-0.36.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(-)?] gles2-only? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=gles2-only? ( !opengl )
-RESTRICT=test
+RDEPEND=>=dev-libs/lzo-2.06-r1: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(-)?] >=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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10: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/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(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs: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(-)?] ) gles2-only? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=gles2-only? ( !opengl ) gles3? ( gles2-only )
+RESTRICT=!test? ( test ) test
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ead26dcead94ab0741e19b760ff6963f
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=17a20f3c86a085f4559d11151ec8430d
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6d5862c1af9a..0d80e23c18cc 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/dmenu-5.2 b/metadata/md5-cache/x11-misc/dmenu-5.2
new file mode 100644
index 000000000000..b95cf46beaea
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/dmenu-5.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=media-libs/fontconfig x11-libs/libX11 >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
+DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window System
+EAPI=8
+HOMEPAGE=https://tools.suckless.org/dmenu/
+INHERIT=savedconfig toolchain-funcs
+IUSE=xinerama savedconfig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=media-libs/fontconfig x11-libs/libX11 >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama )
+SLOT=0
+SRC_URI=https://dl.suckless.org/tools/dmenu-5.2.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0c913d5be63952875c22aa4d04f9aab5
diff --git a/metadata/md5-cache/x11-misc/slock-1.5 b/metadata/md5-cache/x11-misc/slock-1.5
new file mode 100644
index 000000000000..794af88d882c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/slock-1.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-base/xorg-proto
+DESCRIPTION=simple X display locker
+EAPI=8
+HOMEPAGE=https://tools.suckless.org/slock
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=fcaps savedconfig toolchain-funcs
+IUSE=+filecaps savedconfig
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://dl.suckless.org/tools/slock-1.5.tar.gz
+_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9bbc74bc99a777ccc8bb149afd58b48c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index aa5cc7600e42..7edca49ac2fb 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/st-0.9 b/metadata/md5-cache/x11-terms/st-0.9
new file mode 100644
index 000000000000..b7578ec70e81
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/st-0.9
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft ~x11-terms/st-terminfo-0.9 x11-base/xorg-proto
+DESCRIPTION=Simple terminal implementation for X
+EAPI=8
+HOMEPAGE=https://st.suckless.org/
+INHERIT=desktop savedconfig toolchain-funcs
+IUSE=savedconfig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft ~x11-terms/st-terminfo-0.9
+SLOT=0
+SRC_URI=https://dl.suckless.org/st/st-0.9.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0231c9b793dc71cbad4a5df6ae510501
diff --git a/metadata/md5-cache/x11-terms/st-9999 b/metadata/md5-cache/x11-terms/st-9999
index 625be3022088..b5d2822cb5b7 100644
--- a/metadata/md5-cache/x11-terms/st-9999
+++ b/metadata/md5-cache/x11-terms/st-9999
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare unpack
 DEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft ~x11-terms/st-terminfo-9999 x11-base/xorg-proto
 DESCRIPTION=Simple terminal implementation for X
-EAPI=7
+EAPI=8
 HOMEPAGE=https://st.suckless.org/
 INHERIT=desktop savedconfig toolchain-funcs git-r3
 IUSE=savedconfig
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft ~x11-terms/st-terminfo-9999
 SLOT=0
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=317f25d6feaeac23d693f00322636995
+_md5_=0231c9b793dc71cbad4a5df6ae510501
diff --git a/metadata/md5-cache/x11-terms/st-terminfo-0.9 b/metadata/md5-cache/x11-terms/st-terminfo-0.9
new file mode 100644
index 000000000000..b78f76e26215
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/st-terminfo-0.9
@@ -0,0 +1,11 @@
+BDEPEND=>=sys-libs/ncurses-6.0
+DEFINED_PHASES=compile configure install postinst prepare
+DESCRIPTION=Terminfo for x11-terms/st
+EAPI=8
+HOMEPAGE=https://st.suckless.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86
+LICENSE=MIT-with-advertising
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dl.suckless.org/st/st-0.9.tar.gz
+_md5_=c87840b29db2359b3635f1148f1ac7a8
diff --git a/metadata/md5-cache/x11-terms/st-terminfo-9999 b/metadata/md5-cache/x11-terms/st-terminfo-9999
index ca18c232a8fd..6ffc1456a04d 100644
--- a/metadata/md5-cache/x11-terms/st-terminfo-9999
+++ b/metadata/md5-cache/x11-terms/st-terminfo-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53
-_md5_=ccf7902f8e1be1f9381cecb539226dd1
+_md5_=c87840b29db2359b3635f1148f1ac7a8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index e0e30110f867..8b0f8fa43579 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/dwm-6.4 b/metadata/md5-cache/x11-wm/dwm-6.4
new file mode 100644
index 000000000000..2f9bc098b427
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/dwm-6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=media-libs/fontconfig x11-libs/libX11 >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) xinerama? ( x11-base/xorg-proto )
+DESCRIPTION=a dynamic window manager for X11
+EAPI=8
+HOMEPAGE=https://dwm.suckless.org/
+INHERIT=savedconfig toolchain-funcs
+IUSE=xinerama savedconfig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=media-libs/fontconfig x11-libs/libX11 >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama )
+SLOT=0
+SRC_URI=https://dl.suckless.org/dwm/dwm-6.4.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5d6b598b906fa754a9af3275cc7177f6
diff --git a/metadata/md5-cache/x11-wm/dwm-9999 b/metadata/md5-cache/x11-wm/dwm-9999
index 94662609791c..5f9b22cee639 100644
--- a/metadata/md5-cache/x11-wm/dwm-9999
+++ b/metadata/md5-cache/x11-wm/dwm-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) xinerama? ( x11-base/xorg-proto )
+DEPEND=media-libs/fontconfig x11-libs/libX11 >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=a dynamic window manager for X11
-EAPI=7
+EAPI=8
 HOMEPAGE=https://dwm.suckless.org/
 INHERIT=savedconfig toolchain-funcs git-r3
 IUSE=xinerama savedconfig
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
+RDEPEND=media-libs/fontconfig x11-libs/libX11 >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f74b36098c5074cab9b3c35b7900e231
+_md5_=5d6b598b906fa754a9af3275cc7177f6
diff --git a/metadata/md5-cache/x11-wm/metacity-3.46.0 b/metadata/md5-cache/x11-wm/metacity-3.46.0
new file mode 100644
index 000000000000..fd3a1dfa2a3c
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/metacity-3.46.0
@@ -0,0 +1,16 @@
+BDEPEND=vulkan? ( dev-util/vulkan-headers ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=x11-libs/libXres-1.2 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader ) x11-base/xorg-proto
+DESCRIPTION=GNOME Flashback window manager
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/metacity/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+IUSE=+libcanberra vulkan xinerama
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=x11-libs/libXres-1.2 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader )
+SLOT=0
+SRC_URI=mirror://gnome/sources/metacity/3.46/metacity-3.46.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0d7a6460500942b39951f788155bff2a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 479739437c98..3ff5595a071e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-07T17:40:03Z
+TIMESTAMP 2022-10-07T23:40:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNAZHNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNAuNhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD3AA//bY7sZyX4qErUQTWLM3tH440dXxbNr7oyssZu0IHc61QdAEkbIXoNNvhK
-RUYI1mAwFB6exhnrXswmXAJAjgQElF2hO2MVM4l+9R66zpDS4m6hE2KduESU46fK
-gav9wHPbiz23gpwXCOqIC1lAhCj1/2an/FSymQ8Ey9hEmcVB4geEZvcaLDJjJMUV
-ZlkSlEvGvAKduQKlNYk5CuiWZAcPUBjn2BP8hr6riwOnmCmSJgWHWscufHjIn8Kp
-w1dKE0xbADpvwhCvnWTfLMPne26Ep9d6nHLFE+NUgLIYmZE+yQLHjXVhswMCRbGH
-eFZEAM2fezRrgV2jRHoGk/EnClfMjg+4A6srUZhTZUBKHjaC2TSnZlmEk2qtxUIV
-HlnwmETo50BZEt4l1CFuv9BBglOSv2ecPU+43QAOU6bXd1Rqn9MbabZ2JXCPgrLN
-/Gf3PRXYO+BmYeRQdBb0MCw462Ujv8Fsf+iBqzu8GNmz603uzeayw695Wc5a0+ws
-icv36wbh6oOQUDdmoQnDqceiix/mhGpTnHrkDQe6lCSTYR2FFrgVXiUD+OANNNCv
-RZ0ZVJbcrudyTqfChFTQTu/jPGd5PPMGoaODbNOqi7IOG4Skc+QEKM7dOcVhoOGX
-4Wxxon44n8WU+YIYD2UU5pZHiQAW5eSCND3KpconS+JWORAS0Q4=
-=mH9G
+klCWjxAAjFYzZ8D3vDXsDo9l9uOw3CtshWaUzWq8wK6PW9jFEA42Fh5959A14TFH
+YYOdm8/QviBeSLJlv+12CxfIEhHWMY1TWXp4eZ77Djw6881jZEIivA6+wwJUVYOK
+wpBmESF9D6hZLU5x8AEdXFBQfvH+6YDN5COWI5KdSb1ixZnkkdxt83SuUfd3M2J0
+pMXHA6UKfobAwcLS8cPWMqboi3QuNh1rAWi0aqlrBAwI4nQgKVwq4tWwbsAJ63xe
+vsI0Q2MFCqmfHClUlwTHJNclugDgAwH5eMROVlMIEVIFgXcwzcve7z+WISqVfOpQ
+NDs7hWTwfEpcoxah4Ru73vTo/iIjOaGJA1xo0tiClJSonIBK/1rCcejSEMZ4/YTi
+OnCLYBtzjLjrmb3i9tJkgbOd3b0OlfeolSbBgc1Hfec3cW6aZoau24lS6gAzocfD
+s5mQMgktFRDqxF9oHraNPyFfEMD90qig7ko4EJMBSmnti7pmNqlSdEBI3Wiw+vA4
+vjw7MMXUkT2o3xRajouc65DbFy9cWMcmId2K27XWemzqJphWGocOaELAajy4eGH9
+Xiu4DSEE80cQjA39aZNdwutRjlJzyWwWgzY+qxgxbn1vWgnnEt+hLicaaTpQiw4j
+UiwF019D7ewQotk0hVwtdl0Hhp3V/sW8+IMfhkLQLxrDGJPQsTQ=
+=5Eo6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 480024d18b33..a6259d7ed627 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Oct 2022 17:40:01 +0000
+Fri, 07 Oct 2022 23:40:03 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ecd037a8e007..40477cf24a8b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct  7 05:40:00 PM UTC 2022
+Fri Oct  7 11:40:03 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e49f088b72d8..54f8772717fe 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Oct 2022 17:45:01 +0000
+Fri, 07 Oct 2022 23:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2521c7f78f6e..bd1b9118289e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9829aee6accc3c9e6ae5f6ba9575e7dc7c88ee85 1665162521 2022-10-07T17:08:41+00:00
+71d8d5f5842e9286a7b626072c85e95fcc117449 1665184982 2022-10-07T23:23:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 03193a12950f..b456998826a2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1665164401 Fri 07 Oct 2022 05:40:01 PM UTC
+1665186001 Fri 07 Oct 2022 11:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7f4ff7570376..a6259d7ed627 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Oct 2022 17:40:00 +0000
+Fri, 07 Oct 2022 23:40:03 +0000
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 5992460313ea..977819c2c967 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 56bb36eace3c..eb7f930d4ae6 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -5,7 +5,9 @@ AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
+DIST transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz 9481044 BLAKE2B 99d287645f4c28a9f021c0923712ca2b0246be53c26b2654a50e00dc7b3db51b7de304280f6ae2d57c879d96ebe811163af3c38a29e64764712d926fa5c3fb0f SHA512 1bd4265e708070577a5624ee33ab8b0a71baa6d12d121974be6c104078289892f35cab6ddb22070c749d8c1333996ad83eb6f08adf96ea492d96104cab550d60
 EBUILD transmission-3.00-r1.ebuild 3115 BLAKE2B 127e0f735cf5790d6a836ad732c3e8e414211d8d299ce90f244011ad8dc4e96bd1a5e69f735b0442cc7192415016fab5c7e81bb5cc37bf6c388c03a54b8c5d89 SHA512 3a867649911e8937c120f890c7a69dd01ef56e3e718212e5d5514308683e514049f4afe975e76340c78a1c389df076822ce02e1f2b36e6ec42fe4753ad8acfda
 EBUILD transmission-3.00-r4.ebuild 3139 BLAKE2B a2218ecab72fe5ebf921cad901d4f3b50f5ab6ae6f938ef52a6e699c6a8f553bc42aa75b9c65186b0e2c5b4c43e7fe07351cf178fd26f9014d32f26bedd4e955 SHA512 c9696e4b0c8056b1ce53bec345d93caae0503ba21671451165f3b57072cc7350719381523de0058e1404bfe8abe947d2bd754302b1101dc32bd212d38370d984
-EBUILD transmission-9999.ebuild 3217 BLAKE2B fa0de9f28eac2b82ceb048f98c5af636415bb7969cd764f94368998b8cb4313d1ae4e0beda72238a0cd063d2cc7d275f0bd389468610759f675f31cc200a91c0 SHA512 c43c95c978cfde69258bd9356ec768d1940208ed5072bbe30f9dd4cd8be5ced8e1d26426f2661a226546717b078268006607477fbd601541ba35af02067c7929
+EBUILD transmission-4.0.0_beta1.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
+EBUILD transmission-9999.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
 MISC metadata.xml 564 BLAKE2B 708f42109f5c57d776242ad935684b78a7f6cc72c439e2bb76d2fb29fb770f5054c6765df0665244c650bc930eeb312957f4749967a9b2771b8a6d032767d3b0 SHA512 22f2e75b57b24f1367cdcfe28600cfa09dab9d741ff1ab84a25052dc455272b9d9d6d62d297bdbd23e9955d41cabb540f0348c0554c465371e81175525be1ddb
diff --git a/net-p2p/transmission/transmission-4.0.0_beta1.ebuild b/net-p2p/transmission/transmission-4.0.0_beta1.ebuild
new file mode 100644
index 000000000000..6809675fbe91
--- /dev/null
+++ b/net-p2p/transmission/transmission-4.0.0_beta1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2006-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd xdg-utils
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/transmission/transmission"
+else
+	MY_PV="${PV/_beta/-beta.}"
+	MY_P="${PN}-${MY_PV}+r98cf7d9b3c"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A fast, easy, and free BitTorrent client"
+HOMEPAGE="https://transmissionbt.com/"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT="0"
+IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test web"
+RESTRICT="!test? ( test )"
+
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
+BDEPEND="${ACCT_DEPEND}
+	virtual/pkgconfig
+	nls? (
+		gtk? ( sys-devel/gettext )
+		qt5? ( dev-qt/linguist-tools:5 )
+	)
+"
+COMMON_DEPEND="
+	>=dev-libs/libevent-2.1.0:=
+	!mbedtls? ( dev-libs/openssl:0= )
+	mbedtls? ( net-libs/mbedtls:0= )
+	net-libs/libnatpmp
+	>=net-libs/libpsl-0.21.1
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.28.0[ssl]
+	sys-libs/zlib:=
+	nls? ( virtual/libintl )
+	gtk? (
+		>=dev-cpp/gtkmm-3.24.0:3.0
+		>=dev-cpp/glibmm-2.60.0:2
+		appindicator? ( >=dev-libs/libappindicator-0.4.90:3 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtdbus:5
+	)
+	systemd? ( >=sys-apps/systemd-209:= )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMON_DEPEND}
+	${ACCT_DEPEND}
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/transmission/transmission/issues/3901
+	rm -f libtransmission/version.h || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+
+		-DENABLE_GTK=$(usex gtk ON OFF)
+		-DENABLE_QT=$(usex qt5 ON OFF)
+		-DENABLE_MAC=OFF
+		-DENABLE_WEB=$(usex web ON OFF)
+		-DENABLE_CLI=$(usex cli ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF)
+		-DENABLE_NLS=$(usex nls ON OFF)
+
+		-DRUN_CLANG_TIDY=OFF
+
+		-DUSE_SYSTEM_EVENT2=ON
+		-DUSE_SYSTEM_DEFLATE=OFF
+		-DUSE_SYSTEM_DHT=OFF
+		-DUSE_SYSTEM_MINIUPNPC=ON
+		-DUSE_SYSTEM_NATPMP=ON
+		-DUSE_SYSTEM_UTP=OFF
+		-DUSE_SYSTEM_B64=OFF
+		-DUSE_SYSTEM_PSL=ON
+		-DUSE_QT_VERSION=5
+
+		-DWITH_CRYPTO=$(usex mbedtls polarssl openssl)
+		-DWITH_INOTIFY=ON
+		-DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
+	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
+
+	if use systemd; then
+		# Service sets Type=notify
+		systemd_dounit daemon/transmission-daemon.service
+		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
+	fi
+
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
+
+	if [[ ${EUID} == 0 ]]; then
+		diropts -o transmission -g transmission
+	fi
+	keepdir /var/lib/transmission
+}
+
+pkg_postrm() {
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index ddaddc2cac6e..6809675fbe91 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -9,8 +9,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
-	SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	MY_PV="${PV/_beta/-beta.}"
+	MY_P="${PN}-${MY_PV}+r98cf7d9b3c"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
@@ -36,19 +39,19 @@ BDEPEND="${ACCT_DEPEND}
 	)
 "
 COMMON_DEPEND="
-	>=dev-libs/libevent-2.0.10:=
+	>=dev-libs/libevent-2.1.0:=
 	!mbedtls? ( dev-libs/openssl:0= )
 	mbedtls? ( net-libs/mbedtls:0= )
 	net-libs/libnatpmp
 	>=net-libs/libpsl-0.21.1
 	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
+	>=net-misc/curl-7.28.0[ssl]
 	sys-libs/zlib:=
 	nls? ( virtual/libintl )
 	gtk? (
 		>=dev-cpp/gtkmm-3.24.0:3.0
-		>=dev-cpp/glibmm-2.50.1:2
-		appindicator? ( >=dev-libs/libappindicator-0.4.30:3 )
+		>=dev-cpp/glibmm-2.60.0:2
+		appindicator? ( >=dev-libs/libappindicator-0.4.90:3 )
 	)
 	qt5? (
 		dev-qt/qtcore:5
@@ -66,17 +69,26 @@ RDEPEND="${COMMON_DEPEND}
 	${ACCT_DEPEND}
 "
 
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/transmission/transmission/issues/3901
+	rm -f libtransmission/version.h || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 
-		-DENABLE_CLI=$(usex cli ON OFF)
 		-DENABLE_GTK=$(usex gtk ON OFF)
-		-DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF)
-		-DENABLE_NLS=$(usex nls ON OFF)
 		-DENABLE_QT=$(usex qt5 ON OFF)
-		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_MAC=OFF
 		-DENABLE_WEB=$(usex web ON OFF)
+		-DENABLE_CLI=$(usex cli ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF)
+		-DENABLE_NLS=$(usex nls ON OFF)
+
+		-DRUN_CLANG_TIDY=OFF
 
 		-DUSE_SYSTEM_EVENT2=ON
 		-DUSE_SYSTEM_DEFLATE=OFF
@@ -88,8 +100,6 @@ src_configure() {
 		-DUSE_SYSTEM_PSL=ON
 		-DUSE_QT_VERSION=5
 
-		-DRUN_CLANG_TIDY=OFF
-
 		-DWITH_CRYPTO=$(usex mbedtls polarssl openssl)
 		-DWITH_INOTIFY=ON
 		-DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF)
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7faf3d80a7d8..86ea40803c63 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 8c2cd9f81a8f..532b0abd64fe 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2022-10-07)
+# Unstable release. Masked for testing.
+>=x11-libs/cairo-1.17
+
 # Sam James <sam@gentoo.org> (2022-10-07)
 # Ancient K&R C codebase which fails to compile with modern Clang; surface
 # level fixes are doable, but then get into various dangerous constructs
@@ -259,18 +263,6 @@ dev-python/SaltTesting
 # Bug #868762.
 =dev-util/pahole-1.24
 
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-09-07)
-# Python 3.8 only package, no maintainer left.
-# Removal: 2022-10-07.  Bug #869107.
-www-apps/blohg
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-09-07)
-# Python 3.8 only package, 2 open bugs. Recommended to migrate to borg.
-# No upstream activity since 2015.
-# Bugs #674822, #830291, #832240
-# Removal: 2022-10-07.  Bug #869101.
-app-backup/attic
-
 # Mike Gilbert <floppym@gentoo.org> (2022-09-05)
 # Crash due to double-free.
 # https://bugs.gentoo.org/868567
@@ -475,7 +467,10 @@ sys-devel/automake:1.11
 >=dev-libs/libgweather-4.2.0
 >=dev-python/nautilus-python-4.0
 >=dev-util/devhelp-43
+>=gnome-base/gnome-applets-3.46
 >=gnome-base/gnome-desktop-43
+>=gnome-base/gnome-flashback-3.46
+>=gnome-base/gnome-panel-3.46
 >=gnome-base/gnome-settings-daemon-43
 >=gnome-base/gnome-shell-43
 >=gnome-base/nautilus-43
@@ -488,6 +483,7 @@ sys-devel/automake:1.11
 >=mail-client/balsa-2.6.4
 >=mail-client/evolution-3.46
 >=mail-client/geary-43
+>=media-gfx/gnome-photos-43
 media-libs/libshumate
 >=net-libs/gnome-online-accounts-3.46
 >=net-libs/gssdp-1.6
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cf4ca53606a8..cbc25f4fcc45 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8617,8 +8617,6 @@ www-apache/mod_security:mlogc - Build and install the ModSecurity Audit Log Coll
 www-apache/pwauth:domain-aware - Ignore leading domain names in username (Windows compat)
 www-apache/pwauth:faillog - Log failed login attempts
 www-apache/pwauth:ignore-case - Ignore string case in username (mostly Windows compat)
-www-apps/blohg:git - Enable Git support
-www-apps/blohg:mercurial - Enable Mercurial support
 www-apps/cgit:highlight - Enable source code highlighting
 www-apps/cgit:lua - Enable support for Lua scripting
 www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package
@@ -8843,6 +8841,7 @@ x11-drivers/xf86-video-openchrome:viaregtool - Install registers dumper tool
 x11-drivers/xf86-video-qxl:xspice - Include Xspice, a standard X server that is also a Spice server
 x11-libs/agg:gpc - Enable gpc polygon clipper library
 x11-libs/cairo:gles2-only - Build the OpenGL ES 2 backend
+x11-libs/cairo:gles3 - Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)
 x11-libs/cairo:glib - Compile with GLib Object System support
 x11-libs/cairo:opengl - Build the OpenGL backend
 x11-libs/cairo:utils - Build support for Cairo script and trace utilities
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 588d900be664..cccfeb12469c 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/pysiril/Manifest b/sci-astronomy/pysiril/Manifest
index 2d03c292e863..88719b2422bf 100644
--- a/sci-astronomy/pysiril/Manifest
+++ b/sci-astronomy/pysiril/Manifest
@@ -1,3 +1,3 @@
 DIST pysiril-V0_0_12.tar.bz2 114199 BLAKE2B c16209716c64591a2372dc090f419e5411a2607daa4420470cf7f07a729a997316f0d6f862d20722b2d23091ddd919e570289fdef1b0102b1ad2ae13cc3b4e37 SHA512 460355791f9041ace238f4727f8a219871f560fcf631ca798c1edc0ec729acca98c8abd1b14e460f0f127f5baa03603099a6f5c4151e0c1e627d2cff24bb6f18
-EBUILD pysiril-0.0.12.ebuild 528 BLAKE2B 047f918396918ec5158a18636b42d87b9d7aee44232871d8130e2f63c207bccd23cb886df416a73b49c0570677dc8f2ce91f241c1f0854e26bf5455f018bd9d2 SHA512 617dc5fa76879dcbdb0bb2e2e7acc4d90e65c63c8d3b8a6ada1062151d8f3e76396afbbb09f84a851c328ba719a01636dcd0b531c08c1a934801c70d9c92d082
+EBUILD pysiril-0.0.12.ebuild 527 BLAKE2B ae3e198c8c00d5f46b43cfc76cc1036a4335b3bcc876e1f1ea55426d9753736101b95a7183c5c711e381a1e0258c86664755b865fae9e5ce6e6e25b102cfaf79 SHA512 6a84faf01426ea01751485fdc4662c3975d518afdede918dd2afa742075c0aa158969b761fad98f61de3f3dc4ad7240e20599689108290946d8907c5f0b4a2e0
 MISC metadata.xml 494 BLAKE2B e7781f189c50537ef692224940af06eb26c7703e43edd89fa9a5b49d8eaca673afaf6c52254593fedc4e21ac4bff77dcffaae1fb34babdf233d10b986de8782f SHA512 f5387f6360b29b6f7df9f12f72b2760c8702d57d7c672ca0f3b525fb536f1bc3f5cf11860e83774c680a16984e2f732938354c45ed66eb6a8ac3647532e117d2
diff --git a/sci-astronomy/pysiril/pysiril-0.0.12.ebuild b/sci-astronomy/pysiril/pysiril-0.0.12.ebuild
index 17d3033e0302..87f468756755 100644
--- a/sci-astronomy/pysiril/pysiril-0.0.12.ebuild
+++ b/sci-astronomy/pysiril/pysiril-0.0.12.ebuild
@@ -14,6 +14,6 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="sci-astronomy/siril"
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 9c302dee5ec4..2d9f236bdc1d 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -5,7 +5,7 @@ DIST siril-1.0.1.tar.bz2 2846127 BLAKE2B 15c87e9d3ae175170ad67c1fc65abcca43220d8
 DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041 SHA512 bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a
 DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
 EBUILD siril-1.0.1.ebuild 1609 BLAKE2B 933c63c2afe10cb6948bfa94e3599fc70477ff1e9ed78e4acf3fd460e8de4464c2494d055693d8d0883b723a49e8ff8aed3b2710f529affdc732b5a09b5cdd64 SHA512 e6d718dc597bf50ce8a78b6ac06c57e4986004c7fbf569e94bd819369670b8423074c9ea11fa8385b1159ad1b361c326345b8d0fe24f2580aff3ea20e8d56530
-EBUILD siril-1.0.3.ebuild 1963 BLAKE2B eae825df8488fe9d66238425fe7235a30f0d808d67228d6c772af1c6e2f98d140bbab04b36c1af7391d10aa4ffe36833ac4e5a0d36ed009377a2f59b1e6fd91b SHA512 0a44f95087803a3e73ab0578f04e1d586e688532ab8d4eff4858249e5e9baec1efa25620b6fa7d601e00713254ce03bbf5e9e73771cde4c17ace441a8cb00365
+EBUILD siril-1.0.3.ebuild 1962 BLAKE2B 85c45caf128ad2d14bdd8932e43a4842615100fb0c6db900daa8a5b1a87b1274322f9a47892dd00bec401767927cd42bd6d1f3c3db3aa49e77fb3a328f3556d6 SHA512 96b927e060786bb1d9ee38b97cbd755c1f5bf7a8122a904f9447a0bd55ea44b08c657b7ebf7b069332d6a3852d6072aa99d054a7b3e6b661500686a1f5aab9eb
 EBUILD siril-1.0.5.ebuild 2014 BLAKE2B a5099b8cc32bebe5067f3b1fdd3b976408f10edbf504220dd4c44958a6119af8e15a1c3758b01e6957db4299464fd4310ae6b3a8c539257d97dfe3307c86258a SHA512 f8cc91935475a76bd999a24a115cd443758bce26c877a2d69b157c335951799ebf3542b527bc98349e28b6b4b11356bf32ab0b726fb26c1c1b8ea94a45900ad1
 EBUILD siril-9999.ebuild 1958 BLAKE2B b9c561e60100361d7686e5c7ed34e3836d540d8292b46e38f5c31820ca766e9056d4b8c7f5c51f77c8620b3d3a417e17b95b96984f7f23796c7218e95b63f7cc SHA512 0c56714a1277ec80bbd0cfe807e36f47a263837786d0992cb08b3e39e3a58561dd442639a58792e5189fd4a1a28b6aaf4b2272b84efd413658594e022ddc7432
 MISC metadata.xml 1295 BLAKE2B fa25ab59a14b1fcf3fefcb2d94c5b4c18d6925c6c38643db8a8ab7472d276d62a0576893540c95301d6fa9845f49be51cf9cca6593bbcb61581d7c1a0fdb404e SHA512 ba7d178394de1bc3326969647108771efe82c4b4bc3c293592840d55fa9ec5f6fafcb852f4fd0e427e445cc5984c74df436f7d95538631942a145f7f9dfd3dc3
diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild b/sci-astronomy/siril/siril-1.0.3.ebuild
index d354aede9fea..63aea73ff08c 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/sci-astronomy/sirilic/Manifest b/sci-astronomy/sirilic/Manifest
index 5cf5bc6caea5..85b296778847 100644
--- a/sci-astronomy/sirilic/Manifest
+++ b/sci-astronomy/sirilic/Manifest
@@ -1,3 +1,3 @@
 DIST sirilic-V1_14_3.tar.bz2 100939 BLAKE2B 3eabbde3e0884d793c2b2f87464cbf4acac5382d4d088f30f67405a60d934b4de3fee99ebb8e955f9ba1412c4279fe9acdcd4a8cd9b76a666207684561ec6118 SHA512 e311097481ef60ddac568653816a12f11864f8beeceff5ca0dd9c6e4caaf5d69e1373659be19fa99984ef9797caca8a0c9cbb56adc3143e79f59b75010b306b9
-EBUILD sirilic-1.14.3.ebuild 583 BLAKE2B fc5b340e84c25ae56c2b25f626640be35926595c6d7364b1f5a3685ba53ad824dee58cfac0d3967206af03121c661228c73bbc9dfc502f5cb26211adb65decee SHA512 f903dba34408752db1ce6e1dc60cde310ee270798e3f32984a59628f5c92f8eae99c6bbbec59fc7e98c5aa21deef43f443a13eeecc040f7bef1c99ea7e28fed2
+EBUILD sirilic-1.14.3.ebuild 582 BLAKE2B f9d6c1fa8094d492c7c03dacab104a042b210ece58bcb523a9e1dc1082c3baab2b3315b4f3bed89d8a14f134debd0a6477b11db0e7257990649938496837a0fc SHA512 5ef6d51d0d5610d5ec12870c6dc1a5bef7dead264ed3e60addd54b6a874b9b3a3a38eb570d1d892eb4f6986e3562bb06286554859109861fe10f12a55112b58f
 MISC metadata.xml 689 BLAKE2B 95ee65f7f16fca17c7d63dbdfe19161d6b964902502fb088a3c56b529b2f78872feccfaf1a83cf7b53ab12eb63ac257208e0603d6e09c2c6ec520a64ff7eb692 SHA512 fd1c370fb355d80372dc8e6584e9ac17f9d1f971ad7cb884d0bbb0af9dc44ccad985adfbe81b14554e76c1b7444db004563e8366cccb81a9810141467cdf45ed
diff --git a/sci-astronomy/sirilic/sirilic-1.14.3.ebuild b/sci-astronomy/sirilic/sirilic-1.14.3.ebuild
index 9a431ab22e09..c049c4ce8aa9 100644
--- a/sci-astronomy/sirilic/sirilic-1.14.3.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.14.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="dev-python/wxpython:4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 01f2e2dae180..6a1612fb633e 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/xsv/Manifest b/sci-calculators/xsv/Manifest
index 193704a9fcad..9f42be5b3fd8 100644
--- a/sci-calculators/xsv/Manifest
+++ b/sci-calculators/xsv/Manifest
@@ -45,5 +45,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xsv-0.13.0.tar.gz 60527 BLAKE2B b770209e64d9780c78aa25f938604f2f38b6ad3584a50c43023a1ae6fb6de1ed5ac5ca27fc9553c46f6f3d0953dbcfabffe03d61fe119639e5afa1f10574a4f7 SHA512 a0c9b914071514f6dd1fc19759ff88b7d457979385dd169350d27b0ee464fd21e7165bd81e769487d12ac63c46f78e1af684e690a7126ab9a2c336cee4aa6095
-EBUILD xsv-0.13.0.ebuild 1389 BLAKE2B d59042ed14544b156b0f43a82aa6457f23b344075ebd39e8fdbe626286c0157370b6ac9d998e549c7ffb1088a22b6118fb0b06de22244a7c31e5bb321ff25697 SHA512 b912ca33fe47e7a10251669305aee3dd3cfbb026860779adb91158c29a1cabacc33c68916137cf38cb8f0f1ef7ecf8ae06b74adeff35d1484dd49362878c30a1
+EBUILD xsv-0.13.0.ebuild 1393 BLAKE2B c834a17a1a9ebed4c868e5b43bfb1f78ea55cd1d91fde3e9348e9e0b4e1978f349072f8a5e53f3cd772cae1a88a7ecdc9b7898b4aaff8a4901d8a4fdeb5a5117 SHA512 befa135c337a9370fed62ae3f45573ab79b637f0acd17f3a4d3c1b343b79390afebe233035cdeece9509d69d26fbe468ad9af6a540d744b72d3ac1e8132cbc1d
 MISC metadata.xml 460 BLAKE2B 7b03d4212b0f9ba81316531e23c13da5a6bc19a3eab6db0570d9dfbd6d4dbac16f11475a427957e074165a93ff23c83c8f006799a81b4239689f72b85c133208 SHA512 c886d5aa0a0195fad5dbfcee80208fc38b3008a3e8079a1965ed544ed838a8ad5ba0829921f3f4c9e37d49c75f9d2f4bb25308a55fe7c68afb4f3ff5ae65c103
diff --git a/sci-calculators/xsv/xsv-0.13.0.ebuild b/sci-calculators/xsv/xsv-0.13.0.ebuild
index f04d439a9c62..39510584561d 100644
--- a/sci-calculators/xsv/xsv-0.13.0.ebuild
+++ b/sci-calculators/xsv/xsv-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -60,7 +60,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})
 	https://github.com/BurntSushi/xsv/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( MIT Unlicense ) Apache-2.0 Boost-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 BDEPEND="${RUST_DEPEND}"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 8675b692be3c..3ba71a3b98eb 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index abecd683203d..0d9729c5ee18 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,7 +1,7 @@
-DIST josm-snapshot-18427.jar 16255913 BLAKE2B 9c47d32ab2e199645aa84b6ccdec710cb95e93df7b7c5745378aa2338ead4bd3ad851bca91b701de4f2e4f9e815fb8a6b71aa203c81e2ec323cc43d8d79fe110 SHA512 5269c3bba5d0376c4da9eb9cd561429d9b92ee554b458fd00f3e93607420cdbcdcc5389b58966a15b6ef2a3b94d3bb4bb5d421c5e28e1b6575369df44ed96f87
 DIST josm-snapshot-18463.jar 16273803 BLAKE2B 043121ca1e7512207608dfaa549a53d70532a6844028f2fb2554fc187e41f4220a5aec9032c734356f6f1f42478c5bdb74d7498a9c45929daa430e89ba61c64f SHA512 46152f16a3a019d9231a27f584e5bd8b5865c01e2a9bf94179c81c69fd32fcf532b6d02222e41bf431c3981a0bf375ce7be17551b3c2d7fb0734671bc4e59071
 DIST josm-snapshot-18513.jar 16216859 BLAKE2B e8b941f5e725170c03650cf8319dc92d6484c21d9138827134caeab790ba251ad5ba820398027fdf136ef7c22f4e97fd2989f49390544464e8c763fdb6fc7411 SHA512 a4772803aaa2194a0e8563c08ba81ce9cc0caf719003dcfb07d558b0036c0b59a7367f6182c111a03153e17838e8624e464897145fa6b7815620d68dfb94bd36
-EBUILD josm-bin-18427.ebuild 902 BLAKE2B 09809516397c8139b7c7a5aaa8455846a7fb2a7c43aba801b3c437ae56cd885c0e14782dfb6eee7dfb2c21c0e5a42863f7cba0ccc1211cbe1ed19ed05c7b06e8 SHA512 e04057f2dc94db22192bcfad3652cb9154475febe86268e25838a9e2afc78e1452edf748441e032600ad9408bf65b7b74b8a08cee7ee5f4797da0b08c6fe77bc
+DIST josm-snapshot-18565.jar 16252369 BLAKE2B 86e3ba627ad17dd492dde3b68619842e999151d4ecbccb04311f2fec4298922c3519af8dc470cafe96109db32d1273762497e0047b681dd5e3f8d648be957af1 SHA512 6ccc7d631cfc021248f303f76beca60e4fc9e7c29eba3e5f096fbfa444f8b6babfe844b852c4693c8e5422ce7e826f7c866a9bab9c97dde1dde2d2fa01bcce33
 EBUILD josm-bin-18463.ebuild 902 BLAKE2B 09809516397c8139b7c7a5aaa8455846a7fb2a7c43aba801b3c437ae56cd885c0e14782dfb6eee7dfb2c21c0e5a42863f7cba0ccc1211cbe1ed19ed05c7b06e8 SHA512 e04057f2dc94db22192bcfad3652cb9154475febe86268e25838a9e2afc78e1452edf748441e032600ad9408bf65b7b74b8a08cee7ee5f4797da0b08c6fe77bc
 EBUILD josm-bin-18513.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197
+EBUILD josm-bin-18565.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197
 MISC metadata.xml 544 BLAKE2B 7a1610f8796ea0ea5772fccae64a2a91017c8701f847b03f61624240caca1b655b7865d649790b15b43fc565f5c26dc196c45053207c7caeae2601ec5f290840 SHA512 74c714e664fb2833868093bae98511b5b99955cc862c687bef981280fe86b3663acf8c093d34daa3b30809f1a57910797daf3b2cc79bca50e218213780612e0d
diff --git a/sci-geosciences/josm-bin/josm-bin-18427.ebuild b/sci-geosciences/josm-bin/josm-bin-18565.ebuild
index 37cce593e359..3a5ff50d232a 100644
--- a/sci-geosciences/josm-bin/josm-bin-18427.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-18565.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0 GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8"
 BDEPEND="app-arch/unzip"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 04a774f8ca45..41ad0b2e49b7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 0ba9120ccc86..b8016bae87e3 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,7 +1,5 @@
-DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c SHA512 fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2
-DIST cartopy-0.20.2.tar.gz 10703222 BLAKE2B 18763971b33704c526bc98dede60077382de1e6855bd5dcc8901d729b9400eb2a3fdb2e6e2bd9b705ad2d43ab089e4837f12b7dc465429f1cdede21f174f8ef4 SHA512 1208c11a4b6d4b01b7ed7459ced7d79b0b60abc7be0f88562aa0d3826ac6bcebfe51cdf68213fd668353f4c269eb2c10fc2bf15e9db0b4c5802f629b76be3761
 DIST cartopy-0.20.3.tar.gz 10703747 BLAKE2B 794b0e837893c99bec54423731993a0321f3bd93a01bcc9c1ccfd056d4739d7f4b687c0c05e5e529edd8b350478dc76ccf9f3163061466ee6711949f360f7e7b SHA512 0ac4722ed541d77ac871438b2f4e5252c8ae0ab0551bd62a8ba654e10183bba2f702d70cc7331f1cce488c0a59fe4d24e7009de25d74a563f3b2763a12c504dd
-EBUILD cartopy-0.20.1-r1.ebuild 1874 BLAKE2B e955596b9c373267deca75c209c4467e64e3fa4c59cfe1ce8b486bcca35e8618fc7ca538550409a28a72a6ed52bc3c2be4840245aa7224a50d0466567e791538 SHA512 cfcac803ce9313671b1e106e71cc66ef74bba3455062a31c4ba6e5d04673e7f142405b7cb89841dc2f12faaf10401a6c5857768583dc63a6cc3302ede0478673
-EBUILD cartopy-0.20.2.ebuild 1874 BLAKE2B e955596b9c373267deca75c209c4467e64e3fa4c59cfe1ce8b486bcca35e8618fc7ca538550409a28a72a6ed52bc3c2be4840245aa7224a50d0466567e791538 SHA512 cfcac803ce9313671b1e106e71cc66ef74bba3455062a31c4ba6e5d04673e7f142405b7cb89841dc2f12faaf10401a6c5857768583dc63a6cc3302ede0478673
-EBUILD cartopy-0.20.3.ebuild 1919 BLAKE2B 4bb21e3244ceffb89038d97e34fc86dc81fdb1195ec904697bcd1634fff3b044806875dede6304e8d3b9b90b0a52b009f7b65301d2cd1f0d46fce4487e83eec9 SHA512 5c7f77d8e5b4c48501b51b1968781a3c23d01bb173347431d21adc58f4a2ad1ebab61f56a794b56928fed70733bcd14d2a93a55f85b2fadea1c6f09109ed6294
-MISC metadata.xml 603 BLAKE2B dc4da38fb25d4785362faa8475edb2d3b44aa99c0ce3f3f21ee3c1812a385a715a0d18ece3d58b63e298f997fdebd4762f8395335042bbac6e6fc2aadefee695 SHA512 3fb87e6057c17a7430519fc5e434847cfe13bdf06fa4aab6ed3b6aefe574a078c8750915c65a9d1ed12cecc8c25353e1218aae69dbe0a9e661b9d7499994dea3
+DIST cartopy-0.21.0.gh.tar.gz 10815721 BLAKE2B 8a249d6e6b19d5a784a25d44fe062b5417811078f9b5362beed4e60f6a7e3d89996773a0b9530c96a27d3aa3a5a62ce05010ee17cc9ea71d33b9d7f6d1a5c602 SHA512 bb227e3f9ff591a33e7b4c053010321b04f2a03c68e84b1ea17cab125fc1d04f587b7f54125fe5bd3faae1379a0df8a217fd0ad5f85a7c461f9595f5b38f72f9
+EBUILD cartopy-0.20.3-r2.ebuild 1984 BLAKE2B ae12e25a1efc1dd18d302234af9492d5d6f0a4245936f4b8ebd8847816092f7c4fc64f2d18263eeb2e98658490cf45f16ccd8d61af68d0332453ae7727d1268c SHA512 1074b6c0c09ea18c4cc7618df6e629101cf0b551f425151a5fd738e5ec13851f156a02ab09480c6ebcce49fc9f529debd56f05db30862b98fa4cdb4f238abada
+EBUILD cartopy-0.21.0.ebuild 2051 BLAKE2B df87b3ffde8fa59293b3cb9f6e00e51f302272d434625e4c9dc80b87b7d6c9db46f033c97bf6a27deeba84f5c42a3fe262164cb6c7a2f79d070155fc5f14d047 SHA512 e8c0d16b427828a812a5f1801e53093854c7fc5f1de0ef0343026b2ffec3c73333abc261663c9a589854c61bb21a78ebcdde9c9c25aa0bd1f94b5d853d129ea7
+MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591
diff --git a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
deleted file mode 100644
index b160723004be..000000000000
--- a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 virtualx
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Python package for geospatial data processing and analysis"
-HOMEPAGE="https://scitools.org.uk/cartopy"
-SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-libs/geos
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/pyshp[${PYTHON_USEDEP}]
-	dev-python/shapely[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-	sci-libs/gdal[python,${PYTHON_USEDEP}]
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	>=sci-libs/proj-8
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DEPEND+="test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/flufl-lock[$PYTHON_USEDEP]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	# drop test file requiring network access, which got not covered by markers
-	rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
-	rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.py || die
-	# prepare matplotlib backend for test suite
-	export MPLCONFIGDIR="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"
-	# drop all tests needing network access
-	virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
-}
diff --git a/sci-libs/cartopy/cartopy-0.20.2.ebuild b/sci-libs/cartopy/cartopy-0.20.2.ebuild
deleted file mode 100644
index b160723004be..000000000000
--- a/sci-libs/cartopy/cartopy-0.20.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 virtualx
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Python package for geospatial data processing and analysis"
-HOMEPAGE="https://scitools.org.uk/cartopy"
-SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-libs/geos
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/pyshp[${PYTHON_USEDEP}]
-	dev-python/shapely[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-	sci-libs/gdal[python,${PYTHON_USEDEP}]
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	>=sci-libs/proj-8
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DEPEND+="test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/flufl-lock[$PYTHON_USEDEP]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	# drop test file requiring network access, which got not covered by markers
-	rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
-	rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.py || die
-	# prepare matplotlib backend for test suite
-	export MPLCONFIGDIR="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"
-	# drop all tests needing network access
-	virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
-}
diff --git a/sci-libs/cartopy/cartopy-0.20.3.ebuild b/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
index 8748a3e391ab..7761eefa2010 100644
--- a/sci-libs/cartopy/cartopy-0.20.3.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 virtualx
 
@@ -13,6 +14,7 @@ MY_P=${PN}-${MY_PV}
 DESCRIPTION="Python package for geospatial data processing and analysis"
 HOMEPAGE="https://scitools.org.uk/cartopy"
 SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -24,48 +26,53 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	sci-libs/geos
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/pyshp[${PYTHON_USEDEP}]
-	dev-python/shapely[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-	sci-libs/gdal[python,${PYTHON_USEDEP}]
-	dev-python/pyproj[${PYTHON_USEDEP}]
 	>=sci-libs/proj-8
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		<dev-python/matplotlib-3.6[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+		dev-python/pyproj[${PYTHON_USEDEP}]
+		sci-libs/gdal[python,${PYTHON_USEDEP}]
+		sci-libs/pyshp[${PYTHON_USEDEP}]
+	')
 "
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/filelock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/flufl-lock[${PYTHON_USEDEP}]
+		')
+	)
 "
 
 distutils_enable_tests pytest
 
-DEPEND+="test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/flufl-lock[$PYTHON_USEDEP]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
 python_prepare_all() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-	# drop test file requiring network access, which got not covered by markers
+
+	# Drop test file requiring network access, which got not covered by markers
 	rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
 	rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.py || die
-	# prepare matplotlib backend for test suite
+
+	# Prepare matplotlib backend for test suite
 	export MPLCONFIGDIR="${T}"
 	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	cd "${BUILD_DIR}"
-	# drop all tests needing network access
+	cd "${BUILD_DIR}" || die
+
+	# Drop all tests needing network access
 	virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
 }
diff --git a/sci-libs/cartopy/cartopy-0.21.0.ebuild b/sci-libs/cartopy/cartopy-0.21.0.ebuild
new file mode 100644
index 000000000000..e8fbb387686c
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.21.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing virtualx
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python package for geospatial data processing and analysis"
+HOMEPAGE="https://scitools.org.uk/cartopy"
+SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-libs/geos
+	$(python_gen_cond_dep '
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+		dev-python/pyproj[${PYTHON_USEDEP}]
+		sci-libs/gdal[python,${PYTHON_USEDEP}]
+		sci-libs/pyshp[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/filelock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/flufl-lock[${PYTHON_USEDEP}]
+			dev-python/pytest-mpl[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Require network access, not covered by markers
+	lib/cartopy/tests/mpl/test_crs.py
+	lib/cartopy/tests/mpl/test_gridliner.py
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	# Prepare matplotlib backend for test suite
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+
+	# Drop all tests needing network access
+	virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed"
+}
diff --git a/sci-libs/cartopy/metadata.xml b/sci-libs/cartopy/metadata.xml
index 54adce33ba14..3eeb27253d18 100644
--- a/sci-libs/cartopy/metadata.xml
+++ b/sci-libs/cartopy/metadata.xml
@@ -12,4 +12,8 @@
 		and its ability to transform points, lines, vectors, polygons and i
 		images between those projections.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">SciTools/cartopy</remote-id>
+		<remote-id type="pypi">Cartopy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 8e55f789d206..48b69255f632 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index 69e15af8a589..6c31393529b0 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,3 +1,3 @@
 DIST pythonprop-0.30.tar.gz 1141872 BLAKE2B 0703358221825bbeffb47cd5ff97a8de4c22ed9922347b96e359c7fbeffd6bae681a81d4938c03f4199ce583821d6e1006ce2e12aa718f50b5de69f2c0476a38 SHA512 421cade49a241d0dd38afa92e2c1874e2e6a0837ac7aeb9f4a294a2cec23e80e446e88a4de202de445cde73b9d816f4d6e487536be8c02017f1754c116fba310
-EBUILD pythonprop-0.30.ebuild 1186 BLAKE2B d382394232a6c34472d2b4801ff259092cbd88db94773b5ec3f0ede8d2b4cbaba3753a1611c279fdb8bebab32b0468a223000dc2c2e73e447bf8b2b610e467d1 SHA512 fbdf6232323a61315f3fb785a742d7a23f9ce2920c6ff384444a8b8b2f4ef4634a09cb09e38a9aa073795bf59c0cfeb17be3ac43f5b63c28685736d8916956b7
+EBUILD pythonprop-0.30-r1.ebuild 1192 BLAKE2B f70323a02dc0788af3450e74bae0ca963335d30b7d0811cbdaf0379d85679cb6b07bda3518a1e2a337d40bcd00ec0a3d57de88da6fe1338c4afcdfc92d3df26f SHA512 61d79c6c7bc14d10b0fd3591396bf5fb7bf32ad7b4afa2a2d2cf54a7fd75f2dbc4662f2df1ea8a9cb81c24ba307063e6bdcb92beeb2e6ecbc824bad5fd388209
 MISC metadata.xml 460 BLAKE2B 2fc78265ea1592a637191c799bd9547edf6fa2a4d4bafa2193d290c5992941251c1538e0b41929df07394644ef575aca50968a3517fc7f2ec2466dae30c4394e SHA512 71795b8277bfc20c6043cc30f20bd7f9a8f613752ea74c0f27e142c8b4746079b8df6bfe8587868f9581329a954e3a7bdb5dd5094ff5efef319ab4010a27eadc
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.ebuild b/sci-visualization/pythonprop/pythonprop-0.30-r1.ebuild
index 9788a4b51e84..b6a921e16480 100644
--- a/sci-visualization/pythonprop/pythonprop-0.30.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,10 +22,10 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		sci-libs/cartopy[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 	')
 	dev-python/cairocffi
+	sci-libs/cartopy[${PYTHON_SINGLE_USEDEP}]
 	sci-electronics/voacapl
 "
 DEPEND="${RDEPEND}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 0509cd8a8b1f..b9522e86b199 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 66d0b53fb172..58efc356fdad 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,4 +1,3 @@
-AUX tgt-1.0.79-fno-common.patch 605 BLAKE2B e3673ec6f1dd9021da4a0b44b099ccbfed52ba75318e7e43b20d55b2bdff5bc28686792a5be36d753a36aa149ba5f6836211cd8953194d0fe468c167a32132ae SHA512 efcf1e28c52cbfb93ed16a1326b581c8027948e160b87b7fb692c38eebf6f3aa704f854b30a7e4ac36e9d5c9571d0e4b0a6c322d6c895ac02ecd81a8cb07812d
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
 DIST tgt-1.0.83.tar.gz 304631 BLAKE2B 64374e3ffa0fd73f25172e24b233d001dc2b70cbc08116f167de9d625d493dca330e84f73683d6cc74ea76f5bd9fa940cec54d43ebc9c41ed1ff54f5dc3a6e39 SHA512 0c97900aada010b84585a7ad2b1c4654db0fdbc4caed1dea05d00518340b23691ba91f4bb3c677b420a3f4e67f4b061055f877c050ea1d758f2ebb75771b1cf5
diff --git a/sys-block/tgt/files/tgt-1.0.79-fno-common.patch b/sys-block/tgt/files/tgt-1.0.79-fno-common.patch
deleted file mode 100644
index 08933df021d8..000000000000
--- a/sys-block/tgt/files/tgt-1.0.79-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/usr/iscsi/iscsid.c
-+++ b/usr/iscsi/iscsid.c
-@@ -1074,7 +1074,7 @@ void iscsi_rsp_set_residual(struct iscsi_cmd_rsp *rsp, struct scsi_cmd *scmd)
- struct iscsi_sense_data {
- 	uint16_t length;
- 	uint8_t  data[0];
--} __packed;
-+} __attribute__((__packed__));
- 
- static int iscsi_cmd_rsp_build(struct iscsi_task *task)
- {
---- a/usr/iscsi/iser.c
-+++ b/usr/iscsi/iser.c
-@@ -92,7 +92,7 @@ char *iser_portal_addr;
- struct iscsi_sense_data {
- 	uint16_t length;
- 	uint8_t data[0];
--} __packed;
-+} __attribute__((__packed__));
- 
- static size_t buf_pool_sz_mb = DEFAULT_POOL_SIZE_MB;
- static int cq_vector = -1;
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 39e40cbffdb5..b97fc86ecc81 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 00b7a9319bf3..29b79fd4089d 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,4 +1,6 @@
 AUX mtd-utils-2.1.4-glibc-2.36.patch 537 BLAKE2B 14788f3b435c2e4bbb01afed7ce412277a1f72f627fe90b6859e6ed859bb18860312393804e0da868072898684571dc4a6b5398193346025fe0a3878eb4a4c53 SHA512 ce1d72b7edd21d21e3a6a3add78cf146efa39adc34621facb000022bdc2bfbad40e36824d5eeecfca1347f59fa01706f3c4e73ab7ed00f6834235ebe167fa6c8
 DIST mtd-utils-2.1.4.tar.bz2 630365 BLAKE2B 0538ecb90cd1215662cc8493d07e743e067218c1ae1ce09f40343a1ab13f5318d5e198d622a0d69acb2d677cdd3415880689c42afa41877730ff6a546c2b318f SHA512 4010a7b25cf32df2de02b8efbbe91c49789e3963618df7461e4bf64a8c588440c55f17c750a7d2df34367a732b0fefc487ee052129a5aa6a44a0023b714dface
+DIST mtd-utils-2.1.5.tar.bz2 640309 BLAKE2B 94dfd37c10d2759c2fe0b2a7565e2a2aeafdfcaaba2ab9eddc5de2d77658f2702f25004609698585c170839f4e4b685e99004918f1e20cf1ced6925680215427 SHA512 625ee12baf38401c60f6c22d53ed649710417f8d03c6c2217cee890478954e22261428fbf11c713493fb6b7d452ed5af44b0dc9c58133f7b4f52e369353a62c3
 EBUILD mtd-utils-2.1.4-r1.ebuild 952 BLAKE2B 1e7b02e02626649558ef5ce65aab0453cf0c62676b4968b0393a25ffeda3fac89567d0349683304970ffaf747bad7ae00258da449f4ba91f214b857acaf08533 SHA512 7d907aba023347f6eb80b47185cbcf588fee44829b3f0a8b1adc387a624616a3a723a0e6abfcad1abae57802db3358be8a67408c976279c109f8c71f1a40d671
+EBUILD mtd-utils-2.1.5.ebuild 959 BLAKE2B 2eaf9d7c66a0a247db806725d6e22b62310747e4c676283c6034d356d0e2c84385fd079b5a2d8f400af69b2dfa32f4007847ec3541e735cec2268e075687931a SHA512 e21dcfb2bf49cd9a5fda625c8a2f44aa89fe91863654d00f052ebdc200dcea320c05b7176b1f7d5c64d021351eb0554c7b436475e74840553e4fbf248a034abc
 MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
new file mode 100644
index 000000000000..2a257eabb439
--- /dev/null
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
+HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary"
+SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+lzo xattr +zstd"
+
+DEPEND="
+	sys-apps/util-linux:=
+	sys-libs/zlib:=
+	lzo? ( dev-libs/lzo:= )
+	xattr? ( sys-apps/acl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
+
+PATCHES=(
+	#"${FILESDIR}"/${P}-glibc-2.36.patch
+)
+
+src_prepare() {
+	default
+	sed -i '/if test.*then/s: == : = :' configure || die
+}
+
+src_configure() {
+	econf \
+		$(use_with lzo) \
+		$(use_with xattr) \
+		$(use_with zstd)
+}
+
+src_install() {
+	default
+	doman \
+		jffsX-utils/mkfs.jffs2.1 \
+		ubi-utils/ubinize.8
+}
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index 7c257b3a3066..c551f82eded3 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -1,3 +1,5 @@
 DIST squashfuse-0.1.103.tar.gz 399524 BLAKE2B 985ce64052c55a03d4889674682cf8b3bf6fab96de18d38b5b6125a6b2bdf0ec40e9f18a13bb77ea1a963fd0e7debf08d5f4819c543a62a818389b5fa7884815 SHA512 bc640898a5756ceed3260d9dea61dcb54588381b787a50c0fbfce35658fdf7d2788babf4882c369d1981ff853a91f043de8c68727aedc33646c26db4fb0ab2c0
+DIST squashfuse-0.1.105.tar.gz 65644 BLAKE2B 209808164a2803d1f4dedad048f29a809d92e5260193ff2db6a4eed4d887273f6b0b2a673123b9c460e587b9f9884c4115e2323f8de7f26535abcfe4de99ea20 SHA512 6bf18575fd4732f3b0e4530902f2556859c2efbbd781a31bdbf97fe6601412dc750a80354a8ab08a3132d4f8680ea5ff0dd04440f29243906f1017aa6c70bede
 EBUILD squashfuse-0.1.103.ebuild 1175 BLAKE2B aa56b7224858864b2927a570d5f5fa715af6057a270c1fa8af15a20a7b93c7e09b586da744e6c5827d25d573b811ef86882794f45d7e4b26ab3f5ce2d6b8d764 SHA512 2ed4c1f6cc75015449ba7a776fb464c43ae5991dfa5a545fd47d64bff4241e652ffd1b86af45dda581c4f4489badf0574d80ef1349e0dd948a32504c6b53e208
+EBUILD squashfuse-0.1.105.ebuild 1253 BLAKE2B 0e600a78538afbd9ee68b2bfb11b6f18045f6bca47a9f007458f856ee535cc750be3c95c1fad0289cd0dc3f8367356fca4f28a5478838340ec45288e0debb5e6 SHA512 626f72fef5c3a0c4850c3c5afc31f3c36ae990f060b20594f69c612d0e056ada1fd36263df412adcca62de110c742963fc20c0b10556e9c8265b905c3a43534a
 MISC metadata.xml 513 BLAKE2B 0347d4259cc2e4fb927e569ed6ab9c656ded56368b5fe9efba757aba8bedb8ca6da50a6486023c92aedf6de669d73e6be46e9d92a1723b484f815f908d5c2771 SHA512 2b897a8696706e91dc149011274f0b4512f2adc37bfa774ab5bae6991bf8a8a4055e8aa5f9d5291076ead46f607b03adeb724e0380ffe3d863d6943d60179763
diff --git a/sys-fs/squashfuse/squashfuse-0.1.105.ebuild b/sys-fs/squashfuse/squashfuse-0.1.105.ebuild
new file mode 100644
index 000000000000..7d11389df3e2
--- /dev/null
+++ b/sys-fs/squashfuse/squashfuse-0.1.105.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="FUSE filesystem to mount squashfs archives"
+HOMEPAGE="https://github.com/vasi/squashfuse"
+SRC_URI="https://github.com/vasi/squashfuse/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="lz4 lzma lzo static-libs +zlib zstd"
+REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
+
+COMMON_DEPEND="
+	>=sys-fs/fuse-2.8.6:0=
+	lzma? ( >=app-arch/xz-utils-5.0.4:= )
+	zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
+	lzo? ( >=dev-libs/lzo-2.06:= )
+	lz4? ( >=app-arch/lz4-0_p106:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+# Tests require access to /dev/fuse.
+RESTRICT+=" test"
+
+src_configure() {
+	filter-flags -flto* -fwhole-program -fno-common
+	eautoreconf
+
+	local econfargs=(
+		$(use_enable static-libs static)
+		$(use lz4 || echo --without-lz4)
+		$(use lzma || echo  --without-xz)
+		$(use lzo || echo --without-lzo)
+		$(use zlib || echo --without-zlib)
+		$(use zstd || echo --without-zstd)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index ffe458e00f6f..6ac57263d78b 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index ae6ee5bf9d19..4ee0d2d90768 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,5 +1,5 @@
 AUX minizip-ng-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch 2040 BLAKE2B 679a4c8878b06eb28352942e6b0f8285daf0f2d1cc3315071e3592f10fcfaaa11caf1b67e4a73c83201a85bf63750bbf7d3d0d4d7c2a5b2dd1b317eb5beac9f6 SHA512 b1913d03a49931b929435372b2e07d63ec13bf0513ac39549612514443efcd114d143848e6d0a6de751f1ed8499ecae4ecbfb0fce579e6e66549ea90f862417d
 AUX minizip-ng-3.0.6-test-temporary.patch 6922 BLAKE2B 65bc4803aec94e56d7d868096320bac78f425485cff9c0d8d7214e5321e136e239100c292356be69e638f34bba6104bbca95e3db7e8b9f71ccec5e60cab92510 SHA512 e52ebc658cf1bc6df0fcff481562fe61527fbae6fd4a1477ef0a9185e967d9eb0ea7678e6f330429f993fae97a639baf82df672fc1a71275c7f3d7f1c83c8596
 DIST minizip-ng-3.0.6.tar.gz 642138 BLAKE2B 3faddeef035da0417671ef5578b90ad9ec9a69f376d04fb8095f93e27e3276931ef432e179613e841e754ff6e915e8c631eeaa48795aaa87773e45465bd14afa SHA512 92aaad655e7dbec60ab8075435ccdc72314f75f0516aa4a16094215df2b14b108c2b49cdf6c876e396f0f43f52ad63f52ce7db2e119efe25c55b8b873bef9d4f
-EBUILD minizip-ng-3.0.6-r1.ebuild 2493 BLAKE2B 8a8e100a651d7557535991fc3c93dea319a21f95384625d30130c8b29a3c895193f054f65506bb88be56b80f18465a8adce7fd5ea2e2bc643811da5607facb8b SHA512 a0b261602e0fe1d4f0dc2a620d677c4d4f9cf1df88eec77e640f2eb08e327e88cd8fa2cb1b63171223fa92c9dd6854d8b3934a39e75026be1d04dba634ff4db3
+EBUILD minizip-ng-3.0.6-r1.ebuild 2630 BLAKE2B 064300fb88178deb975a1d289da94d6ab8160a9abb4fe56eb6d97c9a97891b33bd87103879b23357de7f1d752fa97b0a5bb243c9fd5e423495db6e739c0e736c SHA512 2c3bcf82cf6791458fbfef030f2299a3fe1b841501b4b80666fb4f14d35eb90e1533eed8724002e04af5dc3375ced455144f639806f37ea0b828576caa304c8a
 MISC metadata.xml 638 BLAKE2B 8a74cb73b53a8fa34aa5ad31ff7770fe47a6224161b6cce692d837004ffcbad15de7d318b3eb9dfa6db0f6f83eae0ed6238df19c27a82daeb7d958113f96478f SHA512 596d4f19cd3680b59ba2f94a8ebedb1fa84f5ca9e3d5125c76b5e787cd8b2e560152bf8151bfe140d03beae6a244b7a87210cc211c8493e0766852c776eef721
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
index 42790b51b0d3..cbc57fa9e859 100644
--- a/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Worth keeping an eye on 'develop' branch upstream for possible backports,
+# as they copied this practice from sys-libs/zlib upstream.
+
 inherit cmake
 
 DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 73ff3ca26501..045959125aae 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,3 +1,3 @@
 DIST zlib-ng-2.0.6.tar.gz 817951 BLAKE2B 52993caadf14817e328b180d728586e1332ea04504288264934ef49441cb8b8c4a2412d4c11d1982f3764fef5e4fb7ebab442b407e57d9d5f08a5b2ed890bba9 SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5
-EBUILD zlib-ng-2.0.6.ebuild 1970 BLAKE2B a9d6e0225a11ad9bdb35221ba1847a3d56a322188c9fe6e4801aa1088263d373982d29b67c61ae09654d8d6c9ec5cfc838d059f4c2ca20d68a5af59673c38221 SHA512 1deaa597f60bcd5b3d3f8e665d6e2eac5baa792f8e6a21ec71232af84dafd937aefe7878b9f6622969dafd31c6678e431873baff426d4cadedf505149ae2a9e4
+EBUILD zlib-ng-2.0.6.ebuild 2107 BLAKE2B d422d0add37f5e0f633fff515778963d17374bca14c7462d4a716c5bb6f3dae9f2cf662415170a7ae6387b58cb271f12b588787312e2b59ca493053de37decbb SHA512 3d7e59525d220a956143e073d6b87f94464fcd742fcd4fe7df3929acd7080c28832a92391cb7d89dfa7907a584e8c8a9ebb4a299ea9556c07a5c47ece1d0e589
 MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 4347d46652d3..3a26044fac17 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Worth keeping an eye on 'develop' branch upstream for possible backports,
+# as they copied this practice from sys-libs/zlib upstream.
+
 inherit cmake
 
 DESCRIPTION="Fork of the zlib data compression library"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 91e99710f7a9..c91584e88154 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index 25be75ea3917..60b1740e24cf 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -1,5 +1,7 @@
+DIST btop-1.2.12.tar.gz 980406 BLAKE2B ddaa023b85a00edfb27b55e574950934cce578ad7bbf0ea03b2780a511078638c14cd2316ebce8701be76c13ed3af8f0ded703071b363fddc14bcbea040279dd SHA512 36bf329a7b9922ff5cae990f5528625280b6b3fcb83d0af2e502876a2a8f4864c3a6ecbc6cb5aaa885f637859eef66470ff0cc86036f76b499b23a7c4086ea60
 DIST btop-1.2.8.tar.gz 976370 BLAKE2B ab71ac322afd84b5b73c5deb9003f319078809d81e2725a7447d2a8fe7539af21c669e7199a3422b2a1cc2ecbd79a46179343e00311f2d56bfa30f51d6340bd3 SHA512 4b5a3685ca5cf301cd7d6556bd365892587e6811f8323ca66728022aba7cc3ff95cf591b452151c9431824dc458bc3d09e10474c7c02a944e8931c4585914f5a
 DIST btop-1.2.9.tar.gz 978265 BLAKE2B ff80079a393342a2cf3aefad6ead8be8b786fbc2b9445e8e2a8b37386f65f4060c801a6f59d216cd611783f4135a60d64b95ff2b5e1a3d62bb2d40030bde8974 SHA512 424573c8f82d0daf748cba7c82e72232773f145af9792ac78a5f5f18d98a8695f11452de106c72cf685ecb8cc89729471a494f9ea6b4300bdb2fa6acdbf4ac60
+EBUILD btop-1.2.12.ebuild 1172 BLAKE2B 2e934a30e9d173620b7b55c30865c06df45549dbfe69a1c7626df665f0587449adf7cfa883942abcd8c96d51beb6a5477246bdddacbfb82227e859b23d3075c5 SHA512 8f07db128338d196ec3a3ab6fda8f01ed3a75e15500ec6a7b8b3f498f35986205a9a370b66424055f3bd6ac3b4fbd3c2076956e1907c1a6f999df9a44b144b1b
 EBUILD btop-1.2.8.ebuild 1168 BLAKE2B 94d4fa9e2bf45294168e815e2255f2b3d1c7c6dec0b45da99b8fa89296544470e8c9f014c6f316beae03045c1d832fa1025962812f47ffb15a1b274f0f5167af SHA512 1bd52b416712b4b1d1280e0cccddd3c2a26a14ae5ac46ea995b6678d8234c2ecf33d13a9b2d836786af1a7bbae78c828c612b261b7640d8526052c1bd3553c31
 EBUILD btop-1.2.9.ebuild 1172 BLAKE2B 2e934a30e9d173620b7b55c30865c06df45549dbfe69a1c7626df665f0587449adf7cfa883942abcd8c96d51beb6a5477246bdddacbfb82227e859b23d3075c5 SHA512 8f07db128338d196ec3a3ab6fda8f01ed3a75e15500ec6a7b8b3f498f35986205a9a370b66424055f3bd6ac3b4fbd3c2076956e1907c1a6f999df9a44b144b1b
 MISC metadata.xml 548 BLAKE2B 74762cdc63011b363a4c06de8190541f862d70f0006461c7a1cf2d734caf20601ba0769dc067e261957fe42a64bdaf26297bf3d080c3c08203eabd73165f2f8c SHA512 bb16944df9321001ca5c9e9fff49ea39069386117f0cfde67e8f19e3f44c13d360effb578d2c44c67f792d1ff574830f13cb9ef183f594e39ad3669083f2cf41
diff --git a/sys-process/btop/btop-1.2.12.ebuild b/sys-process/btop/btop-1.2.12.ebuild
new file mode 100644
index 000000000000..6bf13cbd7d95
--- /dev/null
+++ b/sys-process/btop/btop-1.2.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A monitor of resources"
+HOMEPAGE="https://github.com/aristocratos/btop"
+SRC_URI="https://github.com/aristocratos/btop/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	>=sys-devel/gcc-8
+"
+
+pkg_setup() {
+	if [[ "${MERGE_TYPE}" != "binary" ]]; then
+		if ! tc-is-gcc ; then
+			# https://bugs.gentoo.org/839318
+			die "$(tc-getCXX) is not a supported compiler. Please use sys-devel/gcc instead."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	# btop installs README.md to /usr/share/btop by default
+	sed -i '/^.*cp -p README.md.*$/d' Makefile || die
+}
+
+src_compile() {
+	# Disable btop optimization flags, since we have our flags in CXXFLAGS
+	emake OPTFLAGS="" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		DESTDIR="${D}" \
+		install
+
+	dodoc README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 345120dfbe70..78805b4cb972 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
deleted file mode 100644
index 9dc459defdba..000000000000
--- a/www-apps/blohg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e80091c6883e54f050d4cf3f345c4752b635b1297d15e0055c182e00e74165451d695bb396c869c285646f SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865
-DIST blohg-patches-0.13-r4.tar.xz 14960 BLAKE2B 31458f412395000a05b359db25e8af648c54e554a3b3216f6c62355fd7203fc19c4452defe7692d0382653563f7b0565395af4ceb2177cc8e6de1d7e1a3c7b41 SHA512 3f709880bdd1826b74982866931f5002fdda451a205b6c278a9869979314413f37c8bf6400e3064a463f2fd34810e22d0d4cd5dfc89786f9e276dd9bd9fe5ec2
-EBUILD blohg-0.13-r4.ebuild 1773 BLAKE2B 68ea0abad66cfe8a243e1bebd073bde172925e42562ad5eddf8d068b4c834c0f3ba3f5f10ab068c8725af2dea73018cecf78e13b4e68ae3ad5807914535d7b8a SHA512 7ed5c1e90409d39abd426946745e30730efd5f1552f1263195fd54265a28ac768259b4ddc6a5c45c950d5085a7f6650c724fefef64d72670a9cdfad38ca8fb1c
-EBUILD blohg-9999.ebuild 1773 BLAKE2B 68ea0abad66cfe8a243e1bebd073bde172925e42562ad5eddf8d068b4c834c0f3ba3f5f10ab068c8725af2dea73018cecf78e13b4e68ae3ad5807914535d7b8a SHA512 7ed5c1e90409d39abd426946745e30730efd5f1552f1263195fd54265a28ac768259b4ddc6a5c45c950d5085a7f6650c724fefef64d72670a9cdfad38ca8fb1c
-MISC metadata.xml 977 BLAKE2B b082aa5fc839d629ef0ef725debf2790c659c80086e21ca3853b344aeb2f99a8738a78c1bf4b62994fc9b812d8d4ad447b4d221a474588950f27a34c2c1ea070 SHA512 636e4204021027f31834aa8a117d4815f3774a9719b96ef0982c8a71b7827f5141febb18eb1326869f64b03654af100e04c3f339e1694fcdec20651aac1573cb
diff --git a/www-apps/blohg/blohg-0.13-r4.ebuild b/www-apps/blohg/blohg-0.13-r4.ebuild
deleted file mode 100644
index 82259f3e10b6..000000000000
--- a/www-apps/blohg/blohg-0.13-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-GIT_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/rafaelmartins/blohg"
-fi
-
-inherit distutils-r1 ${GIT_ECLASS}
-
-DESCRIPTION="A Mercurial (or Git) based blogging engine"
-HOMEPAGE="https://github.com/rafaelmartins/blohg"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc git +mercurial test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( git mercurial )
-	test? ( git mercurial )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/feedgenerator[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-babel[${PYTHON_USEDEP}]
-	dev-python/Frozen-Flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	git? ( dev-python/pygit2[${PYTHON_USEDEP}] )
-	mercurial? ( >=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-python_prepare_all() {
-	if [[ ${PV} != *9999* ]]; then
-		eapply "${WORKDIR}/${PN}-patches-${PVR}"
-	fi
-
-	if ! use git; then
-		rm -rf blohg/vcs_backends/git || die 'rm failed'
-	fi
-
-	if ! use mercurial; then
-		rm -rf blohg/vcs_backends/hg || die 'rm failed'
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
deleted file mode 100644
index 82259f3e10b6..000000000000
--- a/www-apps/blohg/blohg-9999.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-GIT_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/rafaelmartins/blohg"
-fi
-
-inherit distutils-r1 ${GIT_ECLASS}
-
-DESCRIPTION="A Mercurial (or Git) based blogging engine"
-HOMEPAGE="https://github.com/rafaelmartins/blohg"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc git +mercurial test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( git mercurial )
-	test? ( git mercurial )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/feedgenerator[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-babel[${PYTHON_USEDEP}]
-	dev-python/Frozen-Flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	git? ( dev-python/pygit2[${PYTHON_USEDEP}] )
-	mercurial? ( >=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-python_prepare_all() {
-	if [[ ${PV} != *9999* ]]; then
-		eapply "${WORKDIR}/${PN}-patches-${PVR}"
-	fi
-
-	if ! use git; then
-		rm -rf blohg/vcs_backends/git || die 'rm failed'
-	fi
-
-	if ! use mercurial; then
-		rm -rf blohg/vcs_backends/hg || die 'rm failed'
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/www-apps/blohg/metadata.xml b/www-apps/blohg/metadata.xml
deleted file mode 100644
index 18003f748147..000000000000
--- a/www-apps/blohg/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		blohg is a Mercurial (or Git) based blogging engine written in Python,
-		built with the Flask micro-framework and some of his available extensions.
-		All the content of the blogs are stored inside repositories and the
-		repository history is used for build the posts and pages. blohg uses
-		Jinja2 as template engine.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>rafaelmartins@gentoo.org</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<bugs-to>mailto:blohg@librelist.com</bugs-to>
-		<remote-id type="pypi">blohg</remote-id>
-		<remote-id type="github">rafaelmartins/blohg</remote-id>
-	</upstream>
-	<use>
-		<flag name="git">Enable Git support</flag>
-		<flag name="mercurial">Enable Mercurial support</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 6a6c3a7f5e24..8fc9863df055 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index bf463952b756..3f49b10aa5e9 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -14,5 +14,17 @@ DIST chromium-bin-106.0.5249.103-1-wayland-x86_64.tar.xz 85276328 BLAKE2B 393ca8
 DIST chromium-bin-106.0.5249.103-1-x11-aarch64.tar.xz 83236004 BLAKE2B 72997175e32b8e101af3d9c682ecd8f3c07f49aba2770339b72bacc85a6f91a04ccdca2d415833e7c32b91f5fdf83eab98070e8d5ad88687d8bb0f2343f69971 SHA512 7fc2d20394f80767c65ff31f6c50e0ee970b2354e34f96e5884de94b85da510f5ba166bc3ef50b3e26b73920cce3593bfff9bd99ec4acdbfa8326be4a30377c5
 DIST chromium-bin-106.0.5249.103-1-x11-i686.tar.xz 85294364 BLAKE2B 7117fc44323ffa1bb65f6ba03c1e0d04f929af8efaeafbf6b6b7b2583fc8bc65c3a1a592783a5a820e525ba2b71ef6838fe7366c21b2a74875a3554d5dbd2f5c SHA512 dd92a82851fdb45cdb4c1d522b7a5dbb6a0289d7648507e1fe698c7ece14eb1aba3584da7e7142156d018788c935fed3d200e8e09d531790cd59d43543e7b367
 DIST chromium-bin-106.0.5249.103-1-x11-x86_64.tar.xz 85045040 BLAKE2B 0f1173812f7a28903e348a5c066c27240fb436f6f5205b4386b564d7923e08c929b996e44b8711e92bd880174f5fd86e7f003e182d5862631022b83a02264fda SHA512 9a806a6f90fffffbd6a4efb91b2583c7cddd7e60e82084e8eec64d406b567c2e30f51b6e7e5022fd922e77ff73cf5d5ac23a1a4ad2c93eedad1d500317ae20ce
-EBUILD chromium-bin-106.0.5249.103.ebuild 7272 BLAKE2B aa304efd66ea7214834ddcc7910e716a126d2d98491ee076b60c07391c23e92a07b4658f55a9a6a2a863c9de41ca7dff07bec6fec26ad53c1a7d5de98d0e1751 SHA512 5725c82c0814deca75636d2ebbb62d8f628b41de2a05a9b383d99de0b98f48411ad55f7605cf5744028ba87ea9b85a96c30c1a685cac35cf2183ebdb3f3b6425
+DIST chromium-bin-107.0.5304.29-1-common-aarch64.tar.xz 3211404 BLAKE2B c0ea1b64321de4455d1bc3aa67340df6a0b50581e927d0ca95cb2c90b088901c76b75705bd3a40d32c938d5307998c9311a962ecb01d64ee24a9928bedc5bdf8 SHA512 0b744d524bc01769cf7eb6bce31db6c2f384ac64948981309157853dc74966432f5aa0d22f9c108f0c2510450a53f22efc07f7825a7d6895a3d988af5aa0b110
+DIST chromium-bin-107.0.5304.29-1-common-i686.tar.xz 3253248 BLAKE2B 508dfc7c08510af16f5ee439746c8b44d3d08e4b013127fe1f4dcce7b3423e478b6e29e05c61b002c41c213a9ea3cdf605e8d085b1d2b6b3dd8884e6d843576e SHA512 933b8e5b13f17839cbd745ceb6f1afe96e74f9b4649ea6820c46f43bfc4e775fafdec87aaafbe9f8be3828f47eb11453c9857493887f0e7d3cd441bb779deccd
+DIST chromium-bin-107.0.5304.29-1-common-x86_64.tar.xz 3283228 BLAKE2B 8bc70532c1e1da19f04495baee3a5be7ab69f04b62e457b3a4eb2b2a0b180b02a2bcc409726ae3e5383ebda3d5dc86c835ef7e034e724de52b41fb1184e3b205 SHA512 d118323f54c1a48fc684dfd082bab83c9edb1d73acae5e44498bb4cc14a5beab0609f0143b6ca7c0a21db25e7c9b65968a1448c8eefcbc48771e96b6f15295a6
+DIST chromium-bin-107.0.5304.29-1-common.tar.xz 4430104 BLAKE2B a1d111c1d6ed9cf12a3a02a27b8e32155478e1b418cc889b71d2ca490e02794cce158944ad5d03ad292629f2b813332962eead7d058ac2a9bfff25137c45a473 SHA512 82c56e625a2e5675dd1a68966bc41150d49c0d75b7d40d5f7e11c0b17d83cc767f8494f235a239e97c7fa47b3f5cb4c16d37e068c4263083905ce8cd8d1a7ed1
+DIST chromium-bin-107.0.5304.29-1-l10n.tar.xz 5223852 BLAKE2B a025bad668cefb4ab50486fad3fffae95975dcfdc40f4bf0eca09022c504ffffa262c8ca57692c347dce19a225ebde9665013aecc375ca371dafb103d5e6a36a SHA512 2b026a3110f9662476901b9b29e092d676147e82b8645378a3528cf6b1a7b00fe15442983a5f4c283d73309ae7cba770ba2a034bb0b90e8d121ab6dac80bdc53
+DIST chromium-bin-107.0.5304.29-1-wayland-aarch64.tar.xz 83926632 BLAKE2B 063061cd6dd3cd545bf3ede8855f3858ed5a89755c2b04c84effd103b1fb2df90e8df588966ab21b89f23b8fff5a51ccf42293c6f91517a4200cb1fe60447527 SHA512 cb244d290dc7f2d5001c5a422437ce47a2628773a693330a933d6dfc3176dd3e672119cc7932261db5c98be5824562b7b70211d1f8425b80227c45cb4f4034e2
+DIST chromium-bin-107.0.5304.29-1-wayland-i686.tar.xz 85616652 BLAKE2B 9584c172decf03d9e611a9e6f4f0032c701bfc5f63120f1c0c013753e8ec3f8a9d44750ef4a8daa8805f3b21184ba86a8668a9d92619b05d27e0f57b64d8b03f SHA512 8ef8f781ee6556d86fafb99755143ae51c49d035d99b90b2b162beb6aeeff49d797ec525cfb429a5fc386caf53ab82f068c21eb2b4ddc0557704f7f96e94292e
+DIST chromium-bin-107.0.5304.29-1-wayland-x86_64.tar.xz 85979708 BLAKE2B 1693b87ebc8ad04392abda4cac972a740176dd99cf9d38410c25857457add83fe50002fa0afc89c3353cdecbc32e9c689b457c00b62303bf6309b5e2c0946520 SHA512 2376294b6d03ebb7355754109dd1b37d432c86baa63b663ef4c060f215705c918c5086dce4102b4e96249a953596e6dfcbbc02b455f7ac58ee514fe7d0cbee7f
+DIST chromium-bin-107.0.5304.29-1-x11-aarch64.tar.xz 83690600 BLAKE2B 6f23bbf9f10e248f5effc8be11de2d9c5e27cf7231e42c153b298b3589a7d89b3719e40f017682331a6d90ae6fbed31693f05bf17ff8eff7c54540d2eaabfa38 SHA512 f13d16780f06eef28a9a1a2f4f12bb7c40f8a7d20064f42c7435467d848b062922730a4d0f03c35660ed18df7803878c87de7749012a1de4c7582bf305a8d03d
+DIST chromium-bin-107.0.5304.29-1-x11-i686.tar.xz 85389512 BLAKE2B 715330c9a6c1430290e955262ba0d3dd61147f2a767134fc35738432b5334d093dc8a940cbaf4d2b191f58d495b9e557cb999d8841f4cfa12b5d5d2a43a24082 SHA512 6ab2690d5486b36849e76e758590b65c1bb5b0a4d3ccb86ba909f086c076eee7cb7aaec9eda24629f2acf62774e45cdd5091d0aff26962c1835478e62ae52714
+DIST chromium-bin-107.0.5304.29-1-x11-x86_64.tar.xz 85727940 BLAKE2B f94a00102c93078a147e4dc66333c7cb2ad6820ea61afd4a8be3837d620a29bd31f8bcf0e983008abe280722219c605e2aab0a961778596319ac596fe254a537 SHA512 2202dc504f9cec5eb38a5c7299d5fe9c7af834b1e0ae3162aa2df7e929d6dadf13b2391c7bdf1f4790c532f80364d3d53a1e99c53602f80ca48d10ecfd6b9ffd
+EBUILD chromium-bin-106.0.5249.103.ebuild 7279 BLAKE2B d6784f1e3e60dc72ce421477a229fd3b7157c0f46504ebe269535f3f31b07a4077b55256adbc96decd1fe816ac34aa69bc4671f7d1261193d8f00cae7ba908c6 SHA512 b8d9ad5aa0a9a61228e6ac1d76069a565700c3889b231dfe47730293b8c8df2787a048f24ee4a96e0cc59391da1d8a7384d16504a610506f6e927c50be2dcf8f
+EBUILD chromium-bin-107.0.5304.29.ebuild 7237 BLAKE2B 62e51bba5a0ced4dbc814bcd324b82ad639a76cde2446f6d0d7c88383453927568b9cc2025364ee9b99105d4392ce326e11660417d2edda5344ee6a83786e525 SHA512 de7e03a9a3b762bcd34f27fe0b5f5306e5b71cf756c378f53932a3a3703f7b19368d8f18d158d2aacf2f92518223b3a79e2acaa424310ed8e6bf37c69a346a8c
 MISC metadata.xml 480 BLAKE2B 29b9f565ea38e89bb5559aa99c540e02b77db24046bbe3407d36440d95a7f0850261b08fb243095f4ffb00bb14d72dcb235786dd19040bbe1a2808fef4bdc662 SHA512 980ebd9f5ba50970f73c2cca4e0fc01df5e6003319d63be37dbd063b127786de2ed36a12c97281bb5208a04c52594f7578fdcbf00ea5b49a63995ba55e7e7127
diff --git a/www-client/chromium-bin/chromium-bin-106.0.5249.103.ebuild b/www-client/chromium-bin/chromium-bin-106.0.5249.103.ebuild
index 06ad66a7eaa7..2403860ddfe7 100644
--- a/www-client/chromium-bin/chromium-bin-106.0.5249.103.ebuild
+++ b/www-client/chromium-bin/chromium-bin-106.0.5249.103.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P
 	)"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/stable"
 KEYWORDS="-* amd64 arm64 ~x86"
 IUSE="cpu_flags_x86_sse2 +suid wayland widevine"
 
diff --git a/www-client/chromium-bin/chromium-bin-107.0.5304.29.ebuild b/www-client/chromium-bin/chromium-bin-107.0.5304.29.ebuild
new file mode 100644
index 000000000000..be7bc277c890
--- /dev/null
+++ b/www-client/chromium-bin/chromium-bin-107.0.5304.29.ebuild
@@ -0,0 +1,239 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+inherit chromium-2 desktop pax-utils readme.gentoo-r1 unpacker xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+
+MY_P=${P}-1
+
+SRC_URI="https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common.tar.xz
+	https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-l10n.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-x86_64.tar.xz
+		wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-x86_64.tar.xz )
+		!wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-x86_64.tar.xz )
+	)
+	arm64? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-aarch64.tar.xz
+		wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-aarch64.tar.xz )
+		!wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-aarch64.tar.xz )
+	)
+	x86? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-i686.tar.xz
+		wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-i686.tar.xz )
+		!wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-i686.tar.xz )
+	)"
+
+LICENSE="BSD"
+SLOT="0/beta"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="cpu_flags_x86_sse2 +suid wayland widevine"
+
+RDEPEND="
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-libs/alsa-lib
+	media-libs/flac:0/10-12
+	media-libs/fontconfig
+	>=media-libs/freetype-2.11.0-r1
+	media-libs/libjpeg-turbo
+	media-libs/libwebp
+	media-libs/mesa[gbm(+)]
+	media-libs/openh264:0/6.1
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/pciutils
+	>=sys-devel/gcc-9.3.0
+	>=sys-libs/glibc-2.32
+	sys-libs/zlib[minizip]
+	virtual/ttf-fonts
+	virtual/udev
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/gdk-pixbuf:2
+	|| (
+		x11-libs/gtk+:3[X,wayland?]
+		gui-libs/gtk:4[X,wayland?]
+	)
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	amd64? (
+		widevine? ( www-plugins/chrome-binary-plugins )
+	)
+	wayland? ( dev-libs/wayland )
+"
+
+S=${WORKDIR}
+QA_PREBUILT="*"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_BIN_FLAGS
+in /etc/chromium-bin/default.
+"
+
+pkg_pretend() {
+	if use amd64 || use x86; then
+		if ! use cpu_flags_x86_sse2; then
+			eerror "This package requires a CPU supporting the SSE2 instruction set."
+			die "SSE2 support missing"
+		fi
+	fi
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+
+	if ! use amd64 && use widevine; then
+		ewarn "Widevine CDM plugin is not available for your architecture."
+	fi
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	local CHROMIUM_BIN_HOME="opt/chromium-bin"
+
+	if ! use suid; then
+		rm "${CHROMIUM_BIN_HOME}/chrome-sandbox" || die
+	fi
+
+	# Clean unneeded languages
+	pushd "${CHROMIUM_BIN_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# Install icons
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROMIUM_BIN_HOME}/icons/hicolor/${size}x${size}/apps/chromium-browser.png" ${PN}-browser.png
+	done
+	rm -r "${CHROMIUM_BIN_HOME}/icons"
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium-bin
+	newins "${FILESDIR}/chromium-bin.default" "default"
+
+	# Install desktop entry
+	domenu "${FILESDIR}/chromium-bin-browser-chromium.desktop"
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}/chromium-bin-browser.xml" chromium-bin-browser.xml
+
+	# Install manpage; bug #684550
+	doman "${FILESDIR}/chromium-bin-browser.1"
+	dosym chromium-bin-browser.1 /usr/share/man/man1/chromium-bin.1
+
+	pax-mark m "${CHROMIUM_BIN_HOME}/chrome"
+
+	# Symlink Widevine CDM
+	if use widevine; then
+		dosym "../../usr/$(get_libdir)/chromium-browser/WidevineCdm" "${CHROMIUM_BIN_HOME}/WidevineCdm"
+	fi
+
+	# Install launcher
+	exeinto "${CHROMIUM_BIN_HOME}"
+	doexe "${FILESDIR}/chromium-bin-launcher.sh"
+
+	# It is important that we name the target "chromium-bin-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "../../${CHROMIUM_BIN_HOME}/chromium-bin-launcher.sh" /usr/bin/chromium-bin-browser
+	# keep the old symlink around for consistency
+	dosym "../../${CHROMIUM_BIN_HOME}/chromium-bin-launcher.sh" /usr/bin/chromium-bin
+
+	dosym "../../${CHROMIUM_BIN_HOME}/chromedriver" /usr/bin/chromedriver-bin
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	elog "For VA-API support you need to install x11-libs/libva with"
+	elog "USE=X enabled."
+	elog
+	elog "VA-API is disabled by default at runtime. You have to enable it"
+	elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_BIN_FLAGS"
+	elog "in /etc/chromium-bin/default."
+
+	if use wayland; then
+		elog
+		elog "For screencast support you need to install media-video/pipewire."
+		elog
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+		elog "to CHROMIUM_BIN_FLAGS in /etc/chromium-bin/default."
+	fi
+
+	elog
+	elog "chromium-bin profile defaults to \${HOME}/.config/chromium-bin."
+	elog "Some extensions (e.g. KeepassXC) expect default chromium profile"
+	elog "at \${HOME}/.config/chromium. You can overwrite this by adding"
+	elog "--user-data-dir=\${HOME}/.config/chromium to CHROMIUM_BIN_FLAGS"
+	elog "in /etc/chromium-bin/default."
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6af5d5e8eac9..4a7c2d5982f4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 923b485ad932..29af98520022 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -6,6 +6,8 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 1379 BLAKE2B 60b63e80ae35385a0c2cbbface46379e76ad8cbc472d76fd68803330e42c49f9c71d662b1824ebf16fbd1bde794ec12a34b8e311758d6e639411e35cd1f34f97 SHA512 d9d9e95b80a0aaee703ff4f58526455db5ac57bce35237826ef4730c54f58b6752756ab92f23e36343e056b0e84269c4b692dfc40cc7836afad3b44fc46c2e26
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r5.ebuild 3924 BLAKE2B f41892bc51dffe2123c7b5396952cdec13396cdd8fdbfe9ebf37b9a73471da310618127720c2bac9070087667da1be089bae64a7e8604014c3e965b71e0ebcc6 SHA512 6cb1f355cb870b76615a05db47010f3ed4d80a4fcac929691cef958604e4e9ad5e75e6b82c7acbdcc005dd52525c43281efbdd5bc690102caeac2d2885ba68b2
-EBUILD cairo-9999.ebuild 3508 BLAKE2B b858786e987dfb89fb18a61222d50123d1975ce3eb9e3a324b149b771038ce8d6766bf0107e24cedabef053a812c155f3f938f5eb63ce7e7004904e71339fe5f SHA512 0d6a8991cf66279fc4e894781ba2b0cff145d56ef8ee94f952d736f0eea3751e8dfc396b3e2dcd578350191aa7d31a2c795c9da71027e9f767ff7209f284c82e
-MISC metadata.xml 710 BLAKE2B 11585ec0ac0ad56eb192f84388ab9fb7ce751ae29555fb366cd8966ec38fceace4978a2b6cad310073484eae51539dcbbe68323205b2b8e97217bc1b87f62b48 SHA512 1021784a9a6db6290fa57e2e5ed356131860820a114a601c8e77fab77eb7b075b81f1288e5df97cad8fe2d86b7aeb67a712f8fd9c5ed775d607d50d6a589dc01
+DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
+EBUILD cairo-1.16.0-r6.ebuild 3919 BLAKE2B 4d35c54d4e93fa37dbf726f524b01bc44a0eee6179b1772823f6a08bc75085688bf3d1dff318f71599e8ccc8a46e5fa51c48f13ec0dd7553ad205bed5fbcde4e SHA512 65a715633863be2a29f97786b7db63e2b160f0fe342438d4df6c4eb9ca83ace1cbc6315da229258286f7547490414339b270ad2aa047955c9be5658a694be4c3
+EBUILD cairo-1.17.6.ebuild 2843 BLAKE2B a123d14d1e6cfbe5828662026ce2da1fd2a63a9e545f6abb05038d4b078e934706cb645851595fdd793542615155f74190d32864b0acbd498e86e3023eb04ceb SHA512 455855ba076c41cc60b819c76e77faea4a35b00a91f36ce2b8531f0acdc821f0d0def76fd79edfe6b9ade345744c9786786081295be2fd1d307bd07376f693c7
+EBUILD cairo-9999.ebuild 2843 BLAKE2B a123d14d1e6cfbe5828662026ce2da1fd2a63a9e545f6abb05038d4b078e934706cb645851595fdd793542615155f74190d32864b0acbd498e86e3023eb04ceb SHA512 455855ba076c41cc60b819c76e77faea4a35b00a91f36ce2b8531f0acdc821f0d0def76fd79edfe6b9ade345744c9786786081295be2fd1d307bd07376f693c7
+MISC metadata.xml 843 BLAKE2B 699529d72773e1de0e83551581919bb7a54b7783b2103abc3f900a75f4b96fd899d55b4a996b73e9d091dc4303c2c67b76a258667d81d3cd0032b1ca2c133f69 SHA512 bc3b9ad654865cdb5907860247ccb826f4f665690ff9ef472e6c250ed1e17eb3746923cc78dcd3c594048b690859e0355aa177c60969c73e0f06456df59d57b1
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild b/x11-libs/cairo/cairo-1.16.0-r6.ebuild
index dc8e73c91275..299a8c20e695 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r6.ebuild
@@ -110,7 +110,7 @@ multilib_src_configure() {
 		$(use_enable glib gobject) \
 		$(use_enable opengl gl) \
 		$(use_enable static-libs static) \
-		$(use_enable svg) \
+		--enable-svg \
 		$(use_enable utils trace) \
 		$(use_enable valgrind) \
 		--enable-ft \
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild b/x11-libs/cairo/cairo-1.17.6.ebuild
new file mode 100644
index 000000000000..74987be53131
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+	SRC_URI=""
+else
+	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test"
+REQUIRED_USE="
+	gles2-only? ( !opengl )
+	gles3? ( gles2-only )
+"
+RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib
+
+RDEPEND="
+	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		-Dpng=enabled
+		$(meson_feature aqua quartz)
+		$(meson_feature X tee)
+		$(meson_feature X xcb)
+		$(meson_feature X xlib)
+		-Dxlib-xcb=disabled
+		-Dxml=disabled
+		-Dzlib=enabled
+
+		$(meson_feature test tests)
+
+		-Dgtk2-utils=disabled
+
+		$(meson_feature glib)
+		-Dspectre=disabled # only used for tests
+		$(meson_feature debug symbol-lookup)
+
+		$(meson_use gtk-doc gtk_doc)
+	)
+
+	if use opengl; then
+		emesonargs+=(-Dgl-backend=gl)
+	elif use gles2-only; then
+		if use gles3; then
+			emesonargs+=(-Dgl-backend=glesv3)
+		else
+			emesonargs+=(-Dgl-backend=glesv2)
+		fi
+	else
+		emesonargs+=(-Dgl-backend=disabled)
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+		mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+		rmdir "${ED}"/usr/share/gtk-doc/html || die
+	fi
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 1ee8a6752f0d..74987be53131 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,41 +1,38 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic autotools multilib-minimal
+inherit meson-multilib
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 	SRC_URI=""
 else
-	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
+IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test"
+REQUIRED_USE="
+	gles2-only? ( !opengl )
+	gles3? ( gles2-only )
+"
+RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib
 
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-2"
 RDEPEND="
-	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
 	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.36.0[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
 	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
@@ -43,79 +40,61 @@ RDEPEND="
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-REQUIRED_USE="
-	gles2-only? ( !opengl )
-"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
 	"${FILESDIR}"/${PN}-respect-fontconfig.patch
 )
 
-src_prepare() {
-	default
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	eautoreconf
-}
-
 multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+	local emesonargs=(
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		-Dpng=enabled
+		$(meson_feature aqua quartz)
+		$(meson_feature X tee)
+		$(meson_feature X xcb)
+		$(meson_feature X xlib)
+		-Dxlib-xcb=disabled
+		-Dxml=disabled
+		-Dzlib=enabled
+
+		$(meson_feature test tests)
+
+		-Dgtk2-utils=disabled
+
+		$(meson_feature glib)
+		-Dspectre=disabled # only used for tests
+		$(meson_feature debug symbol-lookup)
+
+		$(meson_use gtk-doc gtk_doc)
+	)
+
+	if use opengl; then
+		emesonargs+=(-Dgl-backend=gl)
+	elif use gles2-only; then
+		if use gles3; then
+			emesonargs+=(-Dgl-backend=glesv3)
+		else
+			emesonargs+=(-Dgl-backend=glesv2)
+		fi
+	else
+		emesonargs+=(-Dgl-backend=disabled)
+	fi
 
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable X xcb) \
-		$(use_enable X xcb-shm) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2-only glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable utils trace) \
-		$(use_enable valgrind) \
-		--enable-ft \
-		--enable-interpreter \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--enable-script \
-		--disable-xlib-xcb \
-		${myopts}
+	meson_src_configure
 }
 
 multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
 	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+		mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+		rmdir "${ED}"/usr/share/gtk-doc/html || die
+	fi
 }
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 367ff5bc5dfa..d4c30a5b0bff 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
 		<flag name="gles2-only">Build the OpenGL ES 2 backend</flag>
+		<flag name="gles3" restrict=">=x11-libs/cairo-1.17">Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)</flag>
 		<flag name="glib">Compile with GLib Object System support</flag>
 		<flag name="utils">Build support for Cairo script and trace utilities</flag>
 		<flag name="valgrind">Built-in support to mark memory regions</flag>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 568a0dd74846..a0f44c961884 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 5d04d9ddd520..8f7863d7f84e 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,7 +1,10 @@
 AUX dmenu-4.9-gentoo.patch 759 BLAKE2B 965ebf79e580466fd98c3621d4d3b0cb9ea961a9f0f27cf1b91a82362aa49939469509929a66a0ef1e7a1be2a9919b2ab821882fa0d6b28e0821194e48e3c739 SHA512 15f379af1133ffa2724a1b5191108a85231f10db16850e14e1a8935f47cb3326061bed3c4854c8aba7bc1076211f1154c5927ff42e46e905b09a695666bbb576
+AUX dmenu-5.2-gentoo.patch 972 BLAKE2B 1fbb21554a33fe2d69ce51190371e23d7909956353f95526d6feb4f94ccaa119ffe08ce024aa8fdd3a4302e5f4a6aaaddaadaccbc0b458cb4535cb27fa99f3a5 SHA512 7e9d63b55424bdcfdca93bc7cfd31da78af70565177c01d571a56c23c072f3dd98e35a885c18aad860ad99f502ab696dbb3b01abc6f3a7f1471d2b9845e9b2b3
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
 DIST dmenu-5.1.tar.gz 16096 BLAKE2B 22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c SHA512 2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453
+DIST dmenu-5.2.tar.gz 16196 BLAKE2B f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d SHA512 7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3
 EBUILD dmenu-5.0.ebuild 1428 BLAKE2B 57053391b0a30b63aa82b904558414903b7d3028d39340b159c42415eb48e4e5adeb737d81becba2e4c8b4b6412a2b1dbf960454c61b96c7d1d776ba57fe1a6c SHA512 db4f3bdfeb1fe94594ea1251866e0f78d7fd9f39c18ed5a14ba3347f97e5b92f45fd3fb61053babff033609ddd598b0adfa8354092c60fcaa3b6d38969df0a03
 EBUILD dmenu-5.1.ebuild 1433 BLAKE2B cb37bc32148f39f037adc68e71ce00060a9821f395b3fe974b83590f9095db7e3b50833577608852d3a6163780a30c53200a088436650a33800b4386838d70c4 SHA512 4610b621b645a5ad63bcbba9d105606f8ca026e4cf29c31b26193ab92e5aec582fa295778d88911f5d917b578052f1cf6730b9d7aa267cf79fe852b3d02f016a
+EBUILD dmenu-5.2.ebuild 1441 BLAKE2B c0f77ffa13a53d1bc8a9bcd755fd660b3cca8cfef537b4268961f3b65b023e99888fca58228e2b5e3a61f054eb27bffe97f55125928603331ed09493b0c0399d SHA512 a242c95e8ba1558fb9ba7943fc7d70935693e4bf4d8d0cef45e09fc3b18ee68c22d740fe0017d30ce9193f1f6223a9138daa87d9e25565d043c0f16720bf3546
 EBUILD dmenu-9999.ebuild 1387 BLAKE2B 5b0e35bff1b1bc2fa2d1d05f9e0acd0993b2070a2f9a989e79afc8f2f2ee9323d9636f23728877209a4f3cedd2fca363219175982a2971eb6fdc2cec54ab9ecf SHA512 4d1abfe39c176103d2aa364884f7c91e4701279dd4e57816b48a72b3adfee5154610c8e82297bfdf4fe6dea2669a5f3db72609e17dde90547ee469b31c5bb79d
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
new file mode 100644
index 000000000000..de7dd36d35cb
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="https://tools.suckless.org/dmenu/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	>=x11-libs/libXft-2.3.5
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
+		"X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+		"X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+		)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	save_config config.h
+}
diff --git a/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
new file mode 100644
index 000000000000..91ee6f353bda
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
@@ -0,0 +1,26 @@
+From 3c494e2289c93ab6262409f9498866bdfd57bcf4 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 7 Oct 2022 11:29:04 -0700
+Subject: [PATCH] gentoo patch
+
+--- a/config.mk
++++ b/config.mk
+@@ -20,13 +20,13 @@ FREETYPEINC = /usr/include/freetype2
+ #MANPREFIX = ${PREFIX}/man
+ 
+ # includes and libs
+-INCS = -I$(X11INC) -I$(FREETYPEINC)
+-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
++INCS = $(X11INC) $(FREETYPEINC)
++LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS)
+ 
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS  = $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
++CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += $(LIBS)
+ 
+ # compiler and linker
+ CC = cc
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index b6b283c87d43..081045b3f5ed 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,4 +1,6 @@
 AUX slock-1.4-fix-link-paths.patch 558 BLAKE2B f2ef75f836b02ec23b98fdb9f302e671ec8a284b75d83f701e14f5d44a746916b670768730759d4767c9617259b6ad1ec6aceecd851973038ffc2382edd99558 SHA512 3610b7e03e7089ffb4207b136f08ac0944d411284dbbf6614c615596451dcab11ad001c01c4f32c0f040138c99d6764428d60050da59933619a8bbf7fd2a011e
 DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
+DIST slock-1.5.tar.gz 6898 BLAKE2B f3435311b24c20fef656589f468b4cd6bbed30568459cb1d525b7dd5b57e5759ee287787d7506ad6cb922fd092bad504f38ab8c57b41deebec4f6aa554269a41 SHA512 2402b1e49f5dbe06cca2f3a31efedce6359413b240f2b98c57147483591a873c3c5457dbf6707485167002ff6d7ee0e9005d9fa506a51bf71337624e8728bb43
 EBUILD slock-1.4-r1.ebuild 1160 BLAKE2B e7eb43a66c713c369dc7dff580fbbe44c6163690adc9e9d815e76b62b6c81460f33ee12b5dd8604f1057f48c09089d7ac4467190f0ef1a3cfc1ad0fbbcf7fa09 SHA512 fb6efd3b182237b772144f002bf8446f94a7190b5e985a58765e8cba40a72924607c4c62e51daa5e4f7a40113c3e3d7377d43afe9930e89451ed84f442c50548
+EBUILD slock-1.5.ebuild 1164 BLAKE2B c0c0418f8362d0e85fcbed0c7d9d726ae02391bfab4b351f190248710cbd1538a6d5d2c8dcc5396b2a3cfd3e5c63e1738b03d268d9cbab4a4225e29284828df2 SHA512 20afb70190973568003dbd050a02a8992b77381d573cb451abe543238cfa2d407970e337a4703fd8a9972b0f113985be5470c65739ff5ed4ecf6eedbe0a20d85
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
new file mode 100644
index 000000000000..34bb4c6a6a2b
--- /dev/null
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps savedconfig toolchain-funcs
+
+DESCRIPTION="simple X display locker"
+HOMEPAGE="https://tools.suckless.org/slock"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/libcrypt:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/slock-1.4-fix-link-paths.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+
+	restore_config config.h
+
+	tc-export CC
+}
+
+src_compile() {
+	emake slock
+}
+
+src_install() {
+	dobin slock
+	save_config config.h
+}
+
+pkg_postinst() {
+	# cap_dac_read_search used to be enough for shadow access
+	# but now slock wants to write to /proc/self/oom_score_adj
+	# and for that it needs:
+	fcaps \
+		cap_dac_override,cap_setgid,cap_setuid,cap_sys_resource \
+		/usr/bin/slock
+
+	savedconfig_pkg_postinst
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 34e83a65cd80..bad6b841c05f 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/st-terminfo/Manifest b/x11-terms/st-terminfo/Manifest
index 64a172c439de..d9103a8b85b9 100644
--- a/x11-terms/st-terminfo/Manifest
+++ b/x11-terms/st-terminfo/Manifest
@@ -1,4 +1,6 @@
 DIST st-0.8.5.tar.gz 47829 BLAKE2B 9c036b39605dcc69c03fd5a67e911545eb41e3e748efbcf4761770b2a9bf9f158fc1da1fc140b84fb9939fcb35ce126de444cd567806c350e8e2905907bdf645 SHA512 45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
+DIST st-0.9.tar.gz 48171 BLAKE2B f6713b565b785549a571b3775346351c6db79dfbb1a93e29aadd722f30e957e9f77d1644b150cd11f0993dec5accad9d825e6d6b380b4c84c5f526b6589d1b15 SHA512 8d996a68d55c63d84da9962911b076ef437842e8cd83d74672d95531dfbaea91e049430886459a99e859ec760bb3754e94bbe1f646410998725e5a8997fb70ea
 EBUILD st-terminfo-0.8.5.ebuild 1075 BLAKE2B d1a07a9f70b408b38b3731b296aa8e2fdc390be1217132ff255dca5c577f1e90746879c1bdc333d5c09ed3ff586408883579d6fb3437f176e4285d93c307f207 SHA512 76bd3955b4a4147cceab56bee302aeb2770a0a76bf9488ef57def038fcff3237d3af386c00ae0f9362ff17f6080dadb53f3045a850364476c487d449299b5632
-EBUILD st-terminfo-9999.ebuild 1069 BLAKE2B 81dbed746b1a45a57a10b54f3b79b955ba43e5a67d7658e516814a85557fd059ea487688957f9915f6d6ebd62044ddfa45448cce1f3052497c8cac4e1ef9562f SHA512 7a33a667cc0729d3b6736d026d675cdb163f843561f068997418460e393d94f81ebbdfe7c3a7f91a80d08d9050afa8b7c83c671f5965daa57b3632291220c750
+EBUILD st-terminfo-0.9.ebuild 1075 BLAKE2B d1a07a9f70b408b38b3731b296aa8e2fdc390be1217132ff255dca5c577f1e90746879c1bdc333d5c09ed3ff586408883579d6fb3437f176e4285d93c307f207 SHA512 76bd3955b4a4147cceab56bee302aeb2770a0a76bf9488ef57def038fcff3237d3af386c00ae0f9362ff17f6080dadb53f3045a850364476c487d449299b5632
+EBUILD st-terminfo-9999.ebuild 1075 BLAKE2B d1a07a9f70b408b38b3731b296aa8e2fdc390be1217132ff255dca5c577f1e90746879c1bdc333d5c09ed3ff586408883579d6fb3437f176e4285d93c307f207 SHA512 76bd3955b4a4147cceab56bee302aeb2770a0a76bf9488ef57def038fcff3237d3af386c00ae0f9362ff17f6080dadb53f3045a850364476c487d449299b5632
 MISC metadata.xml 374 BLAKE2B 2180b96781e3327022f8c34a0f7d44b0af121a976cb4c8dcf2750150ee780a2d1c307d1c92a74abc618be437e12232956df0c3716521bc7e2b863547ecd49cd3 SHA512 86f9db1699905b6e3e1f9607a7cbda32d75e2ed8e87924b69a0ed22cb33afc90a65c7eb02a8345e0ba6483dd2469aeef9c8888b9534538c074ea94d9b7f201da
diff --git a/x11-terms/st-terminfo/st-terminfo-0.9.ebuild b/x11-terms/st-terminfo/st-terminfo-0.9.ebuild
new file mode 100644
index 000000000000..e7705495c78e
--- /dev/null
+++ b/x11-terms/st-terminfo/st-terminfo-0.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for x11-terms/st"
+HOMEPAGE="https://st.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/st"
+else
+	SRC_URI="https://dl.suckless.org/st/st-${PV}.tar.gz"
+	S="${WORKDIR}/st-${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+BDEPEND=">=sys-libs/ncurses-6.0"
+
+RESTRICT="test"
+
+src_prepare() {
+	mkdir -v terminfo || die "Failed to create terminfo directory"
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	tic -sxo terminfo st.info || die "Failed to translate terminfo file"
+}
+
+src_install() {
+	insinto "/usr/share/st"
+	doins -r terminfo
+
+	newenvd - "51${PN}" <<-_EOF_
+		TERMINFO_DIRS="/usr/share/st/terminfo"
+		COLON_SEPARATED="TERMINFO_DIRS"
+	_EOF_
+}
+
+pkg_postinst() {
+	ewarn "Please run env-update and then source /etc/profile in any open shells"
+	ewarn "to update terminfo settings. Relogin to update it for any new shells."
+}
diff --git a/x11-terms/st-terminfo/st-terminfo-9999.ebuild b/x11-terms/st-terminfo/st-terminfo-9999.ebuild
index 05cc1126c2b2..e7705495c78e 100644
--- a/x11-terms/st-terminfo/st-terminfo-9999.ebuild
+++ b/x11-terms/st-terminfo/st-terminfo-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://dl.suckless.org/st/st-${PV}.tar.gz"
 	S="${WORKDIR}/st-${PV}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT-with-advertising"
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index dd5cee1666ce..358c2e26f59a 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,8 +1,10 @@
 AUX st-0.8.4-locale-musl-segfault.patch 513 BLAKE2B 2c2ee2aee8c7a19f11f00d89254e1679cc0278da09b64b469b296c0a81e6afecd67216b70f6244aad086ee1fd5f3729472376968f5247e6891ba39242a8ec9ae SHA512 367b8019ecec058eff0fc499baaea2e29abbf60df6b944eb9b5389336d4e6156fbbc2773326643978eff7cbf15810232f7d30587b0d951ee41ce34114e8277a5
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
 DIST st-0.8.5.tar.gz 47829 BLAKE2B 9c036b39605dcc69c03fd5a67e911545eb41e3e748efbcf4761770b2a9bf9f158fc1da1fc140b84fb9939fcb35ce126de444cd567806c350e8e2905907bdf645 SHA512 45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
+DIST st-0.9.tar.gz 48171 BLAKE2B f6713b565b785549a571b3775346351c6db79dfbb1a93e29aadd722f30e957e9f77d1644b150cd11f0993dec5accad9d825e6d6b380b4c84c5f526b6589d1b15 SHA512 8d996a68d55c63d84da9962911b076ef437842e8cd83d74672d95531dfbaea91e049430886459a99e859ec760bb3754e94bbe1f646410998725e5a8997fb70ea
 EBUILD st-0.8.4-r1.ebuild 1466 BLAKE2B 6a12c7a52c2e626eefe0fcea85f655e54c247596e0ed2400f1e546d7f93012384620dd5717b85d30d6817e8b4623c6bb48ad1b61238c51c38c0427f5bfd3492e SHA512 869a37fed185091df0f48d306245738eb54bc7bcd8392b1582d077f3c389cde296cec2df43f01ee449ad9f159218c45a58717e3d86ec5148e94f1426e1700cc3
 EBUILD st-0.8.4.ebuild 1401 BLAKE2B 6400f8c79f9f20ea5c129aa2088dde5c7c554598eeedbec0beaa56ff31251723a7943974374cd70ba0dbe8c78f797f83ffb4283d1193b5c9f24c41798337a261 SHA512 870cbb53c3eef4f634d028750dee56262725d42e7f9c7902f2ae3e7c87ca40fa0626dbec7c58d86a9a8f5fba5703cd8c01c0da8624310180fd8bf36efd43419e
 EBUILD st-0.8.5.ebuild 1530 BLAKE2B 68fc5e465b2f19bfa5ee95602f9b3ba0a7a09d3bcb82bb49c576bf0fe38f87abd3a15611aa7f9e4f08a43448879229a6b9d51b87c2eea534d642ec69f1503872 SHA512 cad355a70cb0942672cb8eaab106fd89c0850bd1f4afba6f6b98c80f31e89a683be9c8da79c0ddfbb77c38b5e48f200fa97ba252286b5e53cc51d52a1a40b0a1
-EBUILD st-9999.ebuild 1524 BLAKE2B c4d60cd20119173a35ab7c9e4d8a1aa40f7a12c148adf5cb30807421ac808c700b1ce371af6563d19ff7f8bb1beb96b66b9a9b2d12bf47011202074713c6b04c SHA512 26c9ea44a3d848bc3fd0078e2c960370c5b012e8055c09c56df050c185703295457f3aa1c4d31f12dfb269fc7be14196fee9cc1ec3cf3a8bbd12904fef1413a9
+EBUILD st-0.9.ebuild 1530 BLAKE2B fa9e874260da3f1e0ea4c578ddf823da4c882c5594106f6ac0a09695cc15d28673a324e024c7731fe4e6859ab69d21a757285d94a65cc5c75abf4e452b0acf9f SHA512 53f68d59a5d0e12064f5aa998ff640adf48de8ddd5ee0d4d755776a88edca91a0a70c9892f5a717ad93ce523160605ecbd64d8f06bda14425ff24d0bd0032fde
+EBUILD st-9999.ebuild 1530 BLAKE2B fa9e874260da3f1e0ea4c578ddf823da4c882c5594106f6ac0a09695cc15d28673a324e024c7731fe4e6859ab69d21a757285d94a65cc5c75abf4e452b0acf9f SHA512 53f68d59a5d0e12064f5aa998ff640adf48de8ddd5ee0d4d755776a88edca91a0a70c9892f5a717ad93ce523160605ecbd64d8f06bda14425ff24d0bd0032fde
 MISC metadata.xml 374 BLAKE2B 2180b96781e3327022f8c34a0f7d44b0af121a976cb4c8dcf2750150ee780a2d1c307d1c92a74abc618be437e12232956df0c3716521bc7e2b863547ecd49cd3 SHA512 86f9db1699905b6e3e1f9607a7cbda32d75e2ed8e87924b69a0ed22cb33afc90a65c7eb02a8345e0ba6483dd2469aeef9c8888b9534538c074ea94d9b7f201da
diff --git a/x11-terms/st/st-0.9.ebuild b/x11-terms/st/st-0.9.ebuild
new file mode 100644
index 000000000000..a54b97850eb9
--- /dev/null
+++ b/x11-terms/st/st-0.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop savedconfig toolchain-funcs
+
+DESCRIPTION="Simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/${PN}"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	~x11-terms/st-terminfo-${PV}
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+	sed -i \
+		-e '/tic/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_configure() {
+	sed -i \
+		-e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+		config.mk || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index defaa3e758e2..a54b97850eb9 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop savedconfig toolchain-funcs
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.suckless.org/${PN}"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT-with-advertising"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index fd8f92913c63..b158997fef9b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 72310ab8bf66..30426b58c164 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,6 +1,8 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.3.tar.gz 25351 BLAKE2B 06edd0454802d79a5c796951b0a95d5376f0363f0b93ce82569d38af4a96d528c58abf7b9e0f78bb50b48ce8cee0c7993e08fafc8593bc63be6df87c17974f40 SHA512 285bf5e7f419b7bd6d7cd23548a5cb3dce84879b7e841ed3eb08c226f28c8782e37bce2bc481b2e90c4f2160f79d239476d56f01985af0d38a39fb9dce43dede
+DIST dwm-6.4.tar.gz 25321 BLAKE2B 23c8b0fbbdbf417a2ed79727b0001e812a2e022f8bc29b4ec7711711ae995a8d71283aad23f2d11454407ada29e545c302d66bf239d3598498d93335cd32775f SHA512 b13ac4390c7945cfb4e06bbec2cf69a9bf55867fe2babcba1a4945803a12bea88db31ad06dd06627445f8456950deb26f2d631f946c4207ae92e13f273051a51
 EBUILD dwm-6.3.ebuild 1315 BLAKE2B 7134719f7e004a29568957938dde3562474a0e8e1f371dc63af43b1593a32dad4e905317d717e45624cd7f24f7ffe2f7627cec29126f4e7a0b6584869a4ff59f SHA512 567a587dc09aa0d38bc58eba2f02e18aab6d147d649a4e2503952ed6f7abc4855aa04a9fb9c8f01143f57de9666f6336b4aec5d2df6d0cc0dfe28e098f77e029
-EBUILD dwm-9999.ebuild 1320 BLAKE2B 992053f04971aee95ca575fb9ec0a6d07efb5deb29649b74c0c33a2d62c5a554be716e5ab8fc8c7cd788d7a1bd13ce7baa0dc8c626ca980348da850e0ed192fd SHA512 55c8db699520c0e217cc1fc35d4d86109c7179173b3087344acedc5898263f6bffc8581f725db301349cdbb78f5192f8c00c7483cd304025c1221297c9a44693
+EBUILD dwm-6.4.ebuild 1328 BLAKE2B 8a7974b61959db4ac9042b154ed2f616df7ee9a834d06c402080ef5e8d91de7ba58da65c0472c24c1ba703ac42027ea0d403366c4aebbe5fd705b89f00f08c82 SHA512 ff985b41d446012e4dc064e882fc1e7cddd7596260641a1bc4058db22711e0ccea7b1068361d491a4a795eff44001cf3d8339a1178ede3140b07ed48aa536ab3
+EBUILD dwm-9999.ebuild 1328 BLAKE2B 8a7974b61959db4ac9042b154ed2f616df7ee9a834d06c402080ef5e8d91de7ba58da65c0472c24c1ba703ac42027ea0d403366c4aebbe5fd705b89f00f08c82 SHA512 ff985b41d446012e4dc064e882fc1e7cddd7596260641a1bc4058db22711e0ccea7b1068361d491a4a795eff44001cf3d8339a1178ede3140b07ed48aa536ab3
 MISC metadata.xml 503 BLAKE2B 741cc38200fa0911bf9fa1a2afcd0bad76da0469a85a6f72dfce5ed04e57083405cdc0e9ee8ca66b3f9bc88b1845a7132f66552e999f66568e3e044caaa3aaad SHA512 93d86f980268b8c9f2fba670220de0a138ebd7bd22481681ce0af029743a3142e52e215fc8dffcbce6ba882d50e9e1bfbe33eee858fe28978e733c0bfb864582
diff --git a/x11-wm/dwm/dwm-6.4.ebuild b/x11-wm/dwm/dwm-6.4.ebuild
new file mode 100644
index 000000000000..4553c04b8640
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="https://dwm.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/dwm"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	>=x11-libs/libXft-2.3.5
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/ -Os / /" \
+		-e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC="$(tc-getCC)" dwm
+	else
+		emake CC="$(tc-getCC)" XINERAMAFLAGS="" XINERAMALIBS="" dwm
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+
+	save_config config.h
+}
diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
index 555ed365accd..4553c04b8640 100644
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit savedconfig toolchain-funcs
 
@@ -23,7 +23,7 @@ IUSE="xinerama"
 RDEPEND="
 	media-libs/fontconfig
 	x11-libs/libX11
-	x11-libs/libXft
+	>=x11-libs/libXft-2.3.5
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index f4118ff7c264..4a56706f374a 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,3 +1,5 @@
 DIST metacity-3.44.0.tar.xz 1973772 BLAKE2B 24582202543d8f1c29632843615b841be1ec9b03fded4f22d92b50249d7ad9c2978f290633e5a9483f3dec0005b48d8f824e5dd1e4f6f42a52963285b8245f42 SHA512 3538a08633e13f727f8a8ff0c4dcf8cee411d3c4fa011b2391d94e47f3c27516b1fce9f742abb2d845571ae9c148097ced94b33d152919981eda4133e2eaa87e
+DIST metacity-3.46.0.tar.xz 1958124 BLAKE2B f7db5d38ab2c9aef8809f02ada76a453e712a471d59c3c991d0e1a5cfa1b9d37f901f38ef9057301a6232fca49846af0e80c6792bb5dcffa85694f64983d918f SHA512 5a203a4190dc919ec83fa3f4f7a86aa1594c82051b4e5afb76eb11acb38c573367deca85dead64564e2e96304903cd84eb5b4fc904ddc0672677114103d299b2
 EBUILD metacity-3.44.0.ebuild 1289 BLAKE2B 6f454bb3677428e6b63f868d2be60bcd7aab5c568a89592445ee11f52c87d1906c540537ec6f8cbc52f0874ac63691b35764ccd559ebd35439c2d3c8092a3a37 SHA512 a336d179dec5dadc00d749a4f0dffafc5c01c59414ed1d7c790f1157d663d18ab2484e693b69dde4ecefac743d68dc3d9718e406908ee8ecdd848728038f0692
+EBUILD metacity-3.46.0.ebuild 1295 BLAKE2B a5074328f70255fc349b80bda1229498c7c45111f002978ef6d9af8bdff738fabd5932affbc3c37103494b9feb2fd1dbb094df31e437535c44a943c56e861648 SHA512 d508ed8fc03f232aab0d9a652ee264a1d729dac264e18835a8f0b8b31e1e08055043bd43aa764ecb8842dce17ac07b11b4a6d84210cf98e29b0f48885dfb6b4c
 MISC metadata.xml 478 BLAKE2B 6b6edfb923803da21c7d6c7bb9732bc387e4f57d0682ad79a4bad3a973c8f4746ecfe3ccd376f4ae41784e019f29861b973c66cc35ba3535126de2fc6c827b98 SHA512 759912aaecef429c799aa70ec28428be7572f7eb5ddadcc3f6c0aec469d6fd9ddc3cb0d3f54585b60a2a5764bbc6b4bde5da596d9800f5989f638d60795b1533
diff --git a/x11-wm/metacity/metacity-3.46.0.ebuild b/x11-wm/metacity/metacity-3.46.0.ebuild
new file mode 100644
index 000000000000..c27fd8cb6d9d
--- /dev/null
+++ b/x11-wm/metacity/metacity-3.46.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="GNOME Flashback window manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+libcanberra vulkan xinerama"
+KEYWORDS="~amd64 ~riscv"
+
+# TODO: libgtop could be optional, but no knob
+RDEPEND="
+	>=dev-libs/glib-2.67.3:2
+	>=x11-libs/gtk+-3.24.6:3[X]
+	>=x11-libs/pango-1.2.0
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/libXres-1.2
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXpresent
+	libcanberra? ( media-libs/libcanberra[gtk3] )
+	>=x11-libs/startup-notification-0.7
+	x11-libs/libXcursor
+	gnome-base/libgtop:2=
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	gnome-extra/zenity
+	vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	vulkan? ( dev-util/vulkan-headers )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable libcanberra canberra) \
+		$(use_enable xinerama) \
+		$(use_enable vulkan)
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-10-08 01:28:43 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-08 01:28:43 +0100
commit	ad75ca50360f9590325f0f709c091832b70eab1d (patch)
tree	8a0b109f05da2a3728e461abf6e31347c2e8b0b2
parent	7b5e4e1f63da7fb63fba5f1a9fc41866c8ae5b2f (diff)