diff --git a/Manifest.files.gz b/Manifest.files.gz
index cd46ba90736f..8ead590602fb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index ac0bd99099b7..47d4f87f4cea 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
index 3b853ba6c6de..bf0911272422 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+ unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
 COMMON_DEPEND="
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8748b2657e4a..0e8588ae1c18 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 04c7e616bab4..f0d002f62cfa 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,3 +4,4 @@ DIST aws-cli-1.25.3.gh.tar.gz 2221419 BLAKE2B ecc3e16985426b9b6cf6a6fc5cd3cf58d0
 DIST aws-cli-1.25.4.gh.tar.gz 2222045 BLAKE2B 3d8496b997e80b9504c8810a256d6886a7dee239ed0eba74d42d23955d1596d5b7690a20ac31b8f57e004ff27889e8e204b335996d2f629e9ed11b3bfd033641 SHA512 e053529c9e5429e5782e6c3afe26c212599825c78691d8c58a4c5dcd373385c1111afb2f75e09b5c1831d30ce6c890db0e4888fa4d9d874a5fc68994a8c3c5fd
 DIST aws-cli-1.25.5.gh.tar.gz 2222976 BLAKE2B a726ed1ca6eb8172972c53c1418e342fa8b1f1920a3a023f63cef9a0c96e2a6e882246b8bc3caa3ff39fe0e55d66ce6993d395b7817dd1b666251f9c54d44b45 SHA512 e621237d198d15d6be662e22e7e07103969822d6324e8f63737db35c4e7b75c51d12409e1732b5a948ff2c468b7ab904f1f53903a578f04e750e426558979d68
 DIST aws-cli-1.25.6.gh.tar.gz 2223055 BLAKE2B e6e16b3b67110ed185bb94e2d56cef9445b32373e92136bde53f63bb94ff7b1e8749f33b022203ba113fde676aa086ab96b409dde7e4c48cbe5512cd9f3bd65e SHA512 c0f7b27583ce774a34467f6af0796ec4c7252d9babfda6e7a484252d2de417686194b1e7b4dffc6d8545b2126f1b55288703473153f3339656e9e7a350d143d0
+DIST aws-cli-1.25.7.gh.tar.gz 2223153 BLAKE2B fcadda94fd721135f94b1538c4b27e41108064f6fd32f324d5436138e3d1b0ffcab53fcc545b01c461365d55c4bfa2a05d90e94c875c929a3227efae76452415 SHA512 194adacab0df87d8e4f0cdc71bb956bef6dc8b2de2e7e4416c9c079ff2b7c2bce7584ac1049428d0bcb134368b39c37c04bc5e6a8fc7540c44c64f3934ccaf21
diff --git a/app-admin/awscli/awscli-1.25.7.ebuild b/app-admin/awscli/awscli-1.25.7.ebuild
new file mode 100644
index 000000000000..4154af977ee6
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.7.ebuild
@@ -0,0 +1,71 @@
+# 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 bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/terraform/terraform-1.1.7.ebuild b/app-admin/terraform/terraform-1.1.7.ebuild
index 2a4505022323..a4ce65dbc118 100644
--- a/app-admin/terraform/terraform-1.1.7.ebuild
+++ b/app-admin/terraform/terraform-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 RESTRICT="test"
 
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 7ebf43a472f8..32655b432ae0 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,2 +1,4 @@
 DIST vault-1.10.3-vendor.tar.gz 48109465 BLAKE2B 45985a6ae4445ec75b29f198113fdd1f1e3aa54896c2da0fdf817cf30603c36379405aa3a65e8d20c0380a06e9b335186e6228b176d3afc541a28bed749d6129 SHA512 3c9220fb42af1e6f1bafd7991b0026cafe313cfa53d4841d5d4a1a19f10ff369826dc07c3d2eaf21a3c7227dbcafc1c134814a970429b0842919664ee0ef8988
 DIST vault-1.10.3-webui.tar.xz 1258176 BLAKE2B 85fd1b804b880a3dcdbbd4e825b663f02a985259d0a74ab7cddf4a9a2393c60918b389d0e4e81574b93c8b0867647fc1d17f7ca3e719b36ab41d6825adfbdaae SHA512 9640a7e25de0761a310e234098a0dd31db9e04b30036045ff7edaaca8f7496466f1c0148855a5e1ef270638e90a8fb97aff2c5482b32512772021c99691a5aa5
+DIST vault-1.10.4-vendor.tar.gz 50089463 BLAKE2B 299e7619f158a2ea0683feaaff4a7c5019da02fa03daf25e0b4415f03b703ca11733c486165a21ffcd5b3c1d221db5b9e24e898f3cf3de014c09e29531841dcf SHA512 056a6056bac127083358f1811e8e587f0521b734219a6e03e019527fafcadfbd0d71a05314cb269e27b03423349b5a857d234d3949d0d15e7c7b1175bc573c57
+DIST vault-1.10.4-webui.tar.xz 1258340 BLAKE2B 556da0e566852e5c6a091bd9139a88a9099e5f6422e225b7a4068e1bef3d9fd5a2292bb2efbe12545c20f6c956fd6180500972d5248f05bbb96db50a90ae4741 SHA512 ec9cc568d8d56ba379d0fdee31e0edc8aa8110366b112790573794975a0b32324f517e5fead39fbf59ab99667837b0e08ebadfb6d41dcde85d474712b34b475a
diff --git a/app-admin/vault/vault-1.10.4.ebuild b/app-admin/vault/vault-1.10.4.ebuild
new file mode 100644
index 000000000000..34df6d35c25c
--- /dev/null
+++ b/app-admin/vault/vault-1.10.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="
+	app-arch/zip
+	dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		rm -rf "${S}/http/web_ui" || die
+		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+			die "mv failed"
+	else
+		mkdir -p "${S}/http/web_ui" || die
+		touch "${S}/http/web_ui/no_web_ui" || die
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake bin
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 539713a395ab..ccb2f3bd94c1 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch b/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch
new file mode 100644
index 000000000000..671045d7c385
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/832365
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@ LOCALSTATEDIR ?= /var/lib
+ 
+ CFLAGS += $(shell libassuan-config --cflags)
+ CFLAGS += $(shell libgcrypt-config --cflags)
+-CFLAGS += --pedantic -Wall -Werror -std=c99
++CFLAGS += --pedantic -Wall -std=c99
+ LIBS += $(shell libassuan-config --libs)
+ LIBS += $(shell libgcrypt-config --libs)
+ 
diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
index c22ae2b8f88c..f8a6c908946d 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
 SRC_URI="
 	mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz
 	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 
-## Tests fail upstream for SSH connection. Issue has been reported.
+# Tests fail upstream for SSH connection. Issue has been reported.
 RESTRICT="test"
 
 DEPEND="acct-group/monkeysphere
@@ -26,19 +27,20 @@ DEPEND="acct-group/monkeysphere
 	dev-perl/Crypt-OpenSSL-RSA:0=
 	dev-perl/Digest-SHA1:0=
 	app-misc/lockfile-progs:0="
-
 RDEPEND="${DEPEND}
 	net-misc/openssh"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.44-install-uncompressed-man-pages.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.44-install-uncompressed-man-pages.patch
+	"${FILESDIR}"/${PN}-0.44-no-werror.patch
+)
 
 src_prepare() {
 	default
 
-	sed -i \
-		-e "s#share/doc/monkeysphere#share/doc/${PF}#" \
-		Makefile \
-		|| die
+	sed -i -e "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+
+	tc-export CC
 }
 
 pkg_postinst() {
diff --git a/app-crypt/sbsigntools/files/sbsigntools-0.9.4-no-werror.patch b/app-crypt/sbsigntools/files/sbsigntools-0.9.4-no-werror.patch
new file mode 100644
index 000000000000..42650929b87c
--- /dev/null
+++ b/app-crypt/sbsigntools/files/sbsigntools-0.9.4-no-werror.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/832212
+https://bugs.gentoo.org/845372
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Wextra --std=gnu99
+ common_SOURCES = idc.c idc.h image.c image.h fileio.c fileio.h \
+ 	efivars.h $(coff_headers)
+ common_LDADD = ../lib/ccan/libccan.a $(libcrypto_LIBS)
+-common_CFLAGS = -I$(top_srcdir)/lib/ccan/ -Werror
++common_CFLAGS = -I$(top_srcdir)/lib/ccan/
+ 
+ sbsign_SOURCES = sbsign.c $(common_SOURCES)
+ sbsign_LDADD = $(common_LDADD)
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
index b8865b50a89d..ba90949d3bc3 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+)
+
 src_prepare() {
 	mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
 	rmdir "${WORKDIR}"/lib || die "rmdir failed"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 3b2b894b1516..ca21bdc83fff 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 2e1a0c842e8b..f09d190fc087 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,4 +1 @@
-DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709
-DIST neovim-0.6.0.tar.gz 10592213 BLAKE2B f0f4654b6ae37b29c903ec54175b7dc6742c9f8dadd3242119a0288df4e3262ff5d9cb7ccd41fd8b1431db828ddb806714ced62ef1893cb923cf84badd47e3d8 SHA512 c007d076fb89288fe0496fa243fc6f485b0b33120c96b0bf37d8fe6469c672eb641fefbc3f7262ec726e40910c44d37ff7efb1723c05ba920ff6ae512b1d43e6
-DIST neovim-0.6.1.tar.gz 10597584 BLAKE2B 3e2da61b768f5cae44e08f0ef7f386ce4b878b3248c9a7f7691f62dd732abfa59558467e190a5bcbb5f5007801b2003380296678fca42a0b46dde9a71ed496f4 SHA512 399489f6aaabec2a89b695b22dcd860149acaad723372cced0b4d2cdae464e2db5758372b9123cd0d2a683e0ea42b871935eb85e550cecce620d896691cfda53
 DIST neovim-0.7.0.tar.gz 10925354 BLAKE2B 0524d008ba1ebbe823406e94cfb048014b26bc394c686b2dd84bb7fae5a1f7f3acd42764b03b6efec10c0f25045c5838f624542b5125947e5f42d3b0d2ad1f84 SHA512 3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild
deleted file mode 100644
index 7256b3ebf29c..000000000000
--- a/app-editors/neovim/neovim-0.5.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+lto +nvimpager +tui"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-#REQUIRED_USE="test? ( lua_single_target_luajit )"
-#RESTRICT="!test? ( test )"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# TODO: add tests, dev-lua/busted has now got luajit support.
-# bug #584694
-DEPEND="${LUA_DEPS}
-	dev-lua/luv[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1.2
-	dev-libs/msgpack:0=
-	dev-libs/tree-sitter:=
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		-DENABLE_LTO=$(usex lto)
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-		-DMIN_LOG_LEVEL=3
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.6.0.ebuild b/app-editors/neovim/neovim-0.6.0.ebuild
deleted file mode 100644
index 54ffbbed750b..000000000000
--- a/app-editors/neovim/neovim-0.6.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+lto +nvimpager test +tui"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-DEPEND="${LUA_DEPS}
-	dev-lua/luv[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1.2
-	dev-libs/msgpack:0=
-	dev-libs/tree-sitter:=
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		-DENABLE_LTO=$(usex lto)
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-		-DMIN_LOG_LEVEL=3
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.6.1-r1.ebuild b/app-editors/neovim/neovim-0.6.1-r1.ebuild
deleted file mode 100644
index b3ea1f81894c..000000000000
--- a/app-editors/neovim/neovim-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+lto +nvimpager test +tui"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.42.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.42.0:=
-	>=dev-libs/libvterm-0.1.4
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.1:=
-	tui? (
-		>=dev-libs/libtermkey-0.22
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		-DENABLE_LTO=$(usex lto)
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-		-DMIN_LOG_LEVEL=3
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index 8e487d811dd2..b58629ecdc25 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -1,3 +1,2 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-DIST vile-9.8u.tgz 2375989 BLAKE2B 86e2bb01fab7c429233484493aa33c0b807f7babedf6e69f4c526a6677471ff8e43287114073d22ebb229a801ef003779ab587c9a17474519148e1f64d58460e SHA512 fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d
 DIST vile-9.8v.tgz 2405398 BLAKE2B cd8753c57ff95c9b420026128fd19b7c689c99500da7cae91d3160dded46aa101b0cae32daeaf0377d4d72a5e526e8e4f25422bbbff2cc5ecdef10b7f04c8b39 SHA512 b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
diff --git a/app-editors/vile/vile-9.8u-r2.ebuild b/app-editors/vile/vile-9.8u-r2.ebuild
deleted file mode 100644
index a2592e9c62ad..000000000000
--- a/app-editors/vile/vile-9.8u-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="https://invisible-island.net/vile/"
-SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl iconv"
-
-RDEPEND="app-eselect/eselect-vi
-	>=sys-libs/ncurses-5.2:0=
-	virtual/libcrypt:=
-	iconv? ( virtual/libiconv )
-	perl? ( dev-lang/perl:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/flex
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-stripping \
-		--with-ncurses \
-		--with-pkg-config \
-		$(use_with iconv) \
-		$(use_with perl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc CHANGES* README doc/*.doc
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e2c6b0352b18..9ff9d8dc0dd6 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index e42fd3754363..dc8f14f1d9a8 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -1,2 +1,3 @@
 DIST eldev-1.1.1.tar.gz 214901 BLAKE2B 42ca0089519fc97cb3cd89718eee2eef5c14d1b4cfd0864524a8a5cd22855e1fbd399233229951f3356b7f9ff6d69bbe5ed8abd8c6ae6129fae67279f900ce53 SHA512 4665bde0337a224e34fb3ec81fc6013a38800770e81e2b0911c7e05cb958fb18846995cba1494f84ae1299e1e4374645de3173ad12b01b379b61759b3c893032
+DIST eldev-1.1.2.tar.gz 215487 BLAKE2B f34af28c43b9799935a73892561fbe0a28feeb864c05bef9d3fd234cff905096bf84cd12570ac3da00b89b99edc891f13e39ed6c6574e07a67d45db0e25d604c SHA512 59742d1b50be10759dd90aa81e5a80c0c52e3f32b45d458a9774f98f37459682cb5de03c248e4c8dd664f53a8f6253db1dc93a3958a4e74306c50e20e578ef56
 DIST eldev-1.1.tar.gz 214028 BLAKE2B 2e4a7b15df3e897df5fd029c9c2e298d46dd75316810dc5b859c933b818b65b53dd33451d6e284ec4a24de7de251f24225c8641d44f545db62f4f1777c776ab7 SHA512 acdea3eba36c7d1f06111c31b6e6467ec3b33ca42e06af64c0f67dbb2cbba631223c41dabba51eddf668920ab1eb4f75eaef2fe03a9bdd44163a2bc903cfb1ed
diff --git a/app-emacs/eldev/eldev-1.1.2.ebuild b/app-emacs/eldev/eldev-1.1.2.ebuild
new file mode 100644
index 000000000000..3f35959f7270
--- /dev/null
+++ b/app-emacs/eldev/eldev-1.1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Emacs Lisp Development Tool"
+HOMEPAGE="https://github.com/doublep/eldev/"
+SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.adoc )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ELDEV_LOCAL="${S}" ./bin/${PN} test
+}
+
+src_install() {
+	elisp_src_install
+	dobin bin/${PN}
+
+	# NOTICE: If ELDEV_LOCAL is defined Eldev will use it
+	# to load up it's components,
+	# if it is not it will bootstrap itself from network
+	# always check if it uses installed Emacs Lisp files.
+	# Also, do not forget to run `env-update` & reopen your shell.
+	# https://github.com/doublep/eldev#influential-environment-variables
+	echo "ELDEV_LOCAL=${SITELISP}/${PN}" >> "${T}"/99${PN} || die
+	doenvd "${T}"/99${PN}
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
+	ewarn "to use Eldev in a shell before logging out (or restarting"
+	ewarn "your login manager)."
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2239c169121a..4d5fed27cb55 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
index b253c34820df..082f34e59987 100644
--- a/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 # Disabled for now: bug #850628
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
 #DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index 9c937d818458..0c21e628855e 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 # Disabled for now: bug #850628
 #DISTUTILS_USE_PEP517=setuptools
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 udev
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 65564dbeb74a..7ae5a466f38e 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,2 +1,3 @@
 DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b
 DIST free42-nologo-3.0.10.tgz 7455117 BLAKE2B 9e1e1e0e9f5a05be936440305f0301c2faa3e4e59cc30afed25a59aacb2215265a214043a6114e0d4d854cdffceaf2a422025a1cad41eb715c2e39eebeef2f2e SHA512 dde1f71f2a64a670a40782b2144192292a3086bac297625eb7e1cbec9cad09433b5d0dc56efbfd0d567a9d533442f249166f73bc89cbb595085db3002f4b23c7
+DIST free42-nologo-3.0.11a.tgz 7457251 BLAKE2B 22be3d7d84d30ae347d7c24eba1339217cb7ebeae94454b35acdc0c4f6e1c0557858bf866e90bb4008ef78a88c34b2226312ea0ed3a3cadb2c07bb42cc0d5ea9 SHA512 8cac8fb23c26f5dcc7951e875931340eedc4cc63614ea8413d1ca75f1c2a8133f9c18ea4e837fbc9771f127563ae01e6f011e6b4c0d97b4c8b8738c924be8762
diff --git a/app-emulation/free42/free42-3.0.11a.ebuild b/app-emulation/free42/free42-3.0.11a.ebuild
new file mode 100644
index 000000000000..1163a40ac12c
--- /dev/null
+++ b/app-emulation/free42/free42-3.0.11a.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest
index 2cd97749f5d4..f522f663e83d 100644
--- a/app-emulation/plus42/Manifest
+++ b/app-emulation/plus42/Manifest
@@ -1 +1,2 @@
 DIST plus42-upstream-1.0.4.tgz 7583399 BLAKE2B 801c125e8b320a2ae2220595aa6244451f55938db644beb5e619c7789b506ada86b4f22e62c724af19da1240aa6c0fad791e2d6176eb4787435f16c1a44aaccc SHA512 a9c23b582047767fe0c57f35fdb4dfb72d7fdf480106a64f1d1151541c5d08e8a1a973156b0e2e5e9ca2f4f74acfbde2a1d69590c02f480d52dec20981be6c6e
+DIST plus42-upstream-1.0.6.tgz 7583604 BLAKE2B 3cfdf41ee3ba627cfe5191cf9c0e452917b8511931206fd46df8516a225c7e0e447d8410348d9ab324269a3182dd9c4708ac881f46ae5058fdd4784acec82e2d SHA512 9f4573de916ba20fae4400f50cbf64b9bfbc452b4b51e4c674cffd5129cac9c9828eee33ab613abed6d94c5863797c17e3bd78b0df50bbaa8e0f9594450713ab
diff --git a/app-emulation/plus42/plus42-1.0.6.ebuild b/app-emulation/plus42/plus42-1.0.6.ebuild
new file mode 100644
index 000000000000..8239110a87e8
--- /dev/null
+++ b/app-emulation/plus42/plus42-1.0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-upstream-${PV}"
+
+DESCRIPTION="An Enhanced HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/plus42/"
+SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.4-fix-makefile.patch"
+	"${FILESDIR}/${PN}-1.0.4-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/plus42bin gtk/plus42dec
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 8a29d1da1da3..bd68e6dd179a 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/redis_exporter/Manifest b/app-metrics/redis_exporter/Manifest
index 4ded601b32ac..65c3c5bb2b2d 100644
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@@ -2,3 +2,4 @@ DIST redis_exporter-1.37.0-deps.tar.xz 6710680 BLAKE2B acc2a0d0ac448e86e71abb9c1
 DIST redis_exporter-1.37.0.tar.gz 186024 BLAKE2B 8d0e5791fe07d24b740ea8aa250f835d1a4e84d231e59bf64914062a277ec73e8b3e6a3337f769854fa01faaf68f40878b08a813498e6d282295f90d67fb3eb1 SHA512 80992066e510e329bed0a7ba216020a3107bee2446546b3505ffb012b9919eced2f8863d0a82d5d99945bc223cc9dd2ae4efc1d82a4b486257d5f20bf62fd5c6
 DIST redis_exporter-1.38.0-deps.tar.xz 103185452 BLAKE2B a144d70cd20887dca660fc4f4d2d2ce16dc8463ef0906499c730acb11d717d5c5cf8ab9985ffafd4f9c0cf93c677b2e98895a3b48e9f2e1a2813de96e536d89d SHA512 31927c0dfc4c960ad3a91be387fa6b7b2603a6b9c9927b9d50ae9986beae866eb1c04cbcb2699265fecf201bda83e16746e4c8991b8f4560248c19d17c2744e4
 DIST redis_exporter-1.38.0.tar.gz 188310 BLAKE2B 8e1c7ec8635fd3b83a4ef56b6ebd3ad982363b94654be273197be5cd08f64d453a4c3306aa8dcb69023d5ef7e0a2542d23076e4e13456494c8b1fa4637343368 SHA512 540dd3f8e5a64d6070e298b5272460f022bdc9c2f69b88bbfff033aedd26a0d5310b4df768c0b0572a97c76b859de7bba67711fab81c681fc3b7b5bc68b5b7eb
+DIST redis_exporter-1.40.0.tar.gz 188796 BLAKE2B f2bb4d05129f4644d58fae005c13737f76222d32c08b9938a4b4fbb8c5000a6a00529204d839b96ae53f489183caf01ecb113535648cd80b0e9d3872ad35a8b1 SHA512 0909f71b32434bd2b47db505cd48cd5d34c4c7cfa04b513ff53c265bbd6b91c15f4e7bcf18e4b4e1c52940dafe53eed43ab9ae4db33071cd827a6d798878736b
diff --git a/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild b/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild
new file mode 100644
index 000000000000..2c43a3723319
--- /dev/null
+++ b/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+EGIT_COMMIT=3a743038c6c5a80d10ce45a3fbd49412262c300b
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter"
+SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/redis_exporter-1.38.0-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="
+	acct-user/redis_exporter
+	acct-group/redis_exporter"
+DEPEND="${RDEPEND}"
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+		-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
+		-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
+		-i main.go || die
+}
+
+src_compile() {
+	export GOBIN="${S}/bin"
+	go install \
+		-ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
+		./... || die
+}
+
+src_test() {
+	go test -work ./... || die
+}
+
+src_install() {
+	dobin "${GOBIN}/redis_exporter"
+	dodoc README.md
+	local dir
+	for dir in /var/{lib,log}/${PN}; do
+		keepdir "${dir}"
+		fowners ${PN}:${PN} "${dir}"
+	done
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fcf8b2dcaa0b..d1b776671ba0 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ddcutil/ddcutil-1.2.2.ebuild b/app-misc/ddcutil/ddcutil-1.2.2.ebuild
index 9aa77c1cc2d3..d6267f5e0cc6 100644
--- a/app-misc/ddcutil/ddcutil-1.2.2.ebuild
+++ b/app-misc/ddcutil/ddcutil-1.2.2.ebuild
@@ -40,6 +40,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.2-no-werror.patch
+)
+
 pkg_pretend() {
 	# This program needs /dev/ic2-* devices to communicate with the monitor.
 	CONFIG_CHECK="~I2C_CHARDEV"
diff --git a/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch
new file mode 100644
index 000000000000..caedb9922d27
--- /dev/null
+++ b/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch
@@ -0,0 +1,41 @@
+--- a/src/adl/Makefile.am
++++ b/src/adl/Makefile.am
+@@ -6,7 +6,6 @@ AM_CPPFLAGS =        \
+ AM_CPPFLAGS +=  -I@ADL_HEADER_DIR@
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
+ 
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+--- a/src/app_sysenv/Makefile.am
++++ b/src/app_sysenv/Makefile.am
+@@ -12,7 +12,6 @@ endif
+ 
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+ 
+ if ENABLE_CALLGRAPH_COND
+--- a/src/i2c/Makefile.am
++++ b/src/i2c/Makefile.am
+@@ -4,7 +4,6 @@ AM_CPPFLAGS =        \
+   -I$(top_srcdir)/src/public
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+ 
+ if ENABLE_CALLGRAPH_COND
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -4,7 +4,7 @@ $(GLIB_CFLAGS)  \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/public 
+ 
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ 
+ CLEANFILES = \
+ *expand 
diff --git a/app-misc/vifm/vifm-0.11.ebuild b/app-misc/vifm/vifm-0.11.ebuild
index ab6195b7ede0..9927dd8f487f 100644
--- a/app-misc/vifm/vifm-0.11.ebuild
+++ b/app-misc/vifm/vifm-0.11.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
@@ -30,6 +30,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-werror \
 		$(use_enable developer) \
 		$(use_enable extended-keys) \
 		$(use_with magic libmagic) \
diff --git a/app-misc/vifm/vifm-0.12.ebuild b/app-misc/vifm/vifm-0.12.ebuild
index 7ad0e2c512ff..92961f1c2018 100644
--- a/app-misc/vifm/vifm-0.12.ebuild
+++ b/app-misc/vifm/vifm-0.12.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-werror \
 		$(use_enable developer) \
 		$(use_enable extended-keys) \
 		$(use_with magic libmagic) \
diff --git a/app-misc/vifm/vifm-9999.ebuild b/app-misc/vifm/vifm-9999.ebuild
index 327c50b20c44..bcd49b458786 100644
--- a/app-misc/vifm/vifm-9999.ebuild
+++ b/app-misc/vifm/vifm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-werror \
 		$(use_enable developer) \
 		$(use_enable extended-keys) \
 		$(use_with magic libmagic) \
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 86e9bb95693e..47f10ed79a56 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
index 767e106f3f02..ba2c51a3aab7 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
@@ -428,6 +428,10 @@ src_configure() {
 		CXX=${CHOST}-g++
 		NM=gcc-nm
 		RANLIB=gcc-ranlib
+
+		# Apparently the Clang flags get used even for GCC builds sometimes.
+		# bug #838115
+		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
 	fi
 
 	if use custom-cflags ; then
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 67730f9d7995..05a70aea66a3 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -423,6 +423,10 @@ src_configure() {
 		CXX=${CHOST}-g++
 		NM=gcc-nm
 		RANLIB=gcc-ranlib
+
+		# Apparently the Clang flags get used even for GCC builds sometimes.
+		# bug #838115
+		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
 	fi
 
 	if use custom-cflags ; then
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6c87f05ed3dd..20d275f63d6f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -423,6 +423,10 @@ src_configure() {
 		CXX=${CHOST}-g++
 		NM=gcc-nm
 		RANLIB=gcc-ranlib
+
+		# Apparently the Clang flags get used even for GCC builds sometimes.
+		# bug #838115
+		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
 	fi
 
 	if use custom-cflags ; then
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 17b640440dad..404eeda0e81d 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/bash-support/Manifest b/app-vim/bash-support/Manifest
index 129a59a5bb27..fba603c5092b 100644
--- a/app-vim/bash-support/Manifest
+++ b/app-vim/bash-support/Manifest
@@ -1,2 +1 @@
-DIST bash-support-4.2.1.tar.bz2 115200 BLAKE2B 2fab4f1bb0897af389a206051e63d2fe7a8cd89367298b1be51146eed7c0d788b23cec7bc81ce3056d26b5efc920043e67be003e4e6bfe25b503d532c74d9c07 SHA512 12ab39f5cffb58e4adb2137265d6c4f1a61b5f2e360f6866c21ead0a67e02a5445bd12fec5b00b26e5d6102b3aaab99b8b13539a67575067c3ef9b26c4ef8fba
 DIST bash-support-4.3.zip 249238 BLAKE2B 46fa031b4ba927e5a229fa9dc93a3dbe005322a1de494bc8cbeb56138f2c580ea5b39b203d46b59013e1985930422c2e4217234a317fbf8ee6209889c4047323 SHA512 fd9294e467129990bc9796cda309a5b0ec5af3ddbda7f141939622ec0d96c1573b35d9a20e99040d6a4e83b1e98c1f6b847c77d055cca9492922e1080dc64118
diff --git a/app-vim/bash-support/bash-support-4.2.1.ebuild b/app-vim/bash-support/bash-support-4.2.1.ebuild
deleted file mode 100644
index 7f4ee58c004f..000000000000
--- a/app-vim/bash-support/bash-support-4.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: write and run bash scripts using menus and hotkeys"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=365"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-src_install() {
-	dodoc ${PN}/doc/{ChangeLog,bash-hotkeys.pdf}
-	rm -rf ${PN}/doc || die
-
-	vim-plugin_src_install
-}
diff --git a/app-vim/bufexplorer/Manifest b/app-vim/bufexplorer/Manifest
index fe6b1ef75a0c..3f4b5896924c 100644
--- a/app-vim/bufexplorer/Manifest
+++ b/app-vim/bufexplorer/Manifest
@@ -1,2 +1 @@
-DIST bufexplorer-7.4.18.tar.gz 25117 BLAKE2B 2768f7fdc31b4678147d492f3322cf12f97384f3fab4f5219f7237263e83060d24b476c25dabc6850aa6b6168f98b4350c3dfe0fd61a3975a6e607ac4e11e3e4 SHA512 420e3d352bb31a80311c3ab8ad62f7a6530fdcf78eb0bc45717e075f81a3d1a42fef18d756c129d2c25e8d5f7d8e1161affae905cfa7d8b0d1d3c9245c9f1bea
 DIST bufexplorer-7.4.19.tar.gz 25679 BLAKE2B 814adb79fc196174a9915643a3617e3c324f963792a2706f59f35699289524d0b93e7337ec3697d03e3a98b9f15018d40dbf9c0d4f35d6cebde8ea6de4cf1b23 SHA512 d38bcb52a50cfcf6d0b66ca6f1290a6be53d5cee98b3d2d7a93e01b5ef904af53c6cc8256e667bdeeb23a58344f5d69838bb7b5d71d225a83d1e173b99344888
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
deleted file mode 100644
index 78ac03a4a2b0..000000000000
--- a/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easily browse vim buffers"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
-SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
index 782d85f0c0c8..13e5c0d5e4bf 100644
--- a/app-vim/csound-syntax/Manifest
+++ b/app-vim/csound-syntax/Manifest
@@ -1,2 +1 @@
-DIST csound-syntax-0.8.1.tar.gz 404555 BLAKE2B a26d158a3a050b3767cade77a0ccb8f12491a4b9e6957c6c8ccf1de5402367f58ddf9c367f314c0410346de08ddde49964cc4c5e38f6bc7605a4965f28afcedd SHA512 a87458efabcef4e3681b8f6b6325ad1fbe5b68befbf602fe858db2baf455c66c3a5b953a6aeeb28155867f7c53ae29618801c6b66a30118346069a1598b5ada1
 DIST csound-syntax-20160804.tar.bz2 326658 BLAKE2B 04ba7e1eb3afee6b32de4603e91f78fdc7fd3b70b137bd05ecac5ace2b34222a1cc8c095cd7776abe46b7bb18bd67d1711bca75f20e2f656162d414f2c6e2b2f SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8
diff --git a/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild b/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild
deleted file mode 100644
index f72f8e04261f..000000000000
--- a/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-MY_P="csound-vim-${PV}"
-
-DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
-HOMEPAGE="https://github.com/luisjure/csound"
-SRC_URI="https://github.com/luisjure/csound-vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-doc.patch" )
diff --git a/app-vim/ctrlp/Manifest b/app-vim/ctrlp/Manifest
index 072f4a4a991c..6d511f86e161 100644
--- a/app-vim/ctrlp/Manifest
+++ b/app-vim/ctrlp/Manifest
@@ -1,2 +1 @@
-DIST ctrlp-1.80.tar.gz 75269 BLAKE2B 38b70168d5b220dca220b2f1bfddcae1234fabf01348083fd9db4e1ca0396b56eb3f88f1cda84c22884c3946b731de06a710ca89f51a916f4758345afa748b19 SHA512 40175e64bb9c4ccdc202bc31b8956b96ede5761a3a4f17706c4d915f8083991cb7729e33c79d021bf6faff00f381fe9272145f852981e487b279f0471b86cadd
 DIST ctrlp-1.80_p20180418.tar.gz 76376 BLAKE2B 2ae3e85eac29bb07bfafcc60b879b506b57b7874ee9798d4fc0e420e06283ceca4cfe4d282fb9552c1971db48de25dc8df03d3e20d85ae1bbfc72f1162cc1fba SHA512 08a566087e0be0496c3dd1d60e24d65421b7fc758c95d3959181293502dd1e3581066bebea58cc1ef85f2a7cba76b45eee2e5ff2c522e27523ea31bebe4a36d5
diff --git a/app-vim/ctrlp/ctrlp-1.80.ebuild b/app-vim/ctrlp/ctrlp-1.80.ebuild
deleted file mode 100644
index fd21dc094c51..000000000000
--- a/app-vim/ctrlp/ctrlp-1.80.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support"
-HOMEPAGE="https://github.com/ctrlpvim/ctrlp.vim"
-SRC_URI="https://github.com/${PN}vim/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${PN}.vim-${PV}"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-DOCS=( readme.md )
diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
index 41f79655a90f..a30e84e8b6eb 100644
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@@ -1,2 +1 @@
-DIST diffchar-8.2.tar.gz 440613 BLAKE2B e440ef29512348fe82fc4b644fb5e5d9db31582991f22447f2a896180091dc3bd4e2e789ce8ca8984507fd2fe1fe8f53d37ac6913d34960a174dd9003d729e84 SHA512 ff7c01a03bd989fbcdabfda8007e177acab191e283e1617e16dc2a366869ad6946df7b25a2e514f96ad7dc69350f07ffd5eac7b7769f0e017e029343c9756ea1
 DIST diffchar-8.6.tar.gz 392905 BLAKE2B bd3f6b40d79f7c51a9dc881e7a1b24aa1e75812bf76cf42c331d28809fd0f4049d55ded5576d3173f0d039e5621a202a8d5dffa0fd55203dcb45bd950e884898 SHA512 394f7da41f1c09b7c5b99bcb9bc2bf590a7d011d6171dd0d3394c09c2befa0cc676541519fba46e569afad235a19f20f290779ebb21f1fdc7e1d3df290c8936a
diff --git a/app-vim/diffchar/diffchar-8.2.ebuild b/app-vim/diffchar/diffchar-8.2.ebuild
deleted file mode 100644
index 584abecff6a8..000000000000
--- a/app-vim/diffchar/diffchar-8.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin vcs-snapshot
-
-GIT_HASH="837334b268302cf6c597d88485aa8aad6a500b98"
-
-DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
-HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
-SRC_URI="https://github.com/rickhowe/diffchar.vim/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim.org"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/ferret/Manifest b/app-vim/ferret/Manifest
index a591f36b5ad8..b5277d00412f 100644
--- a/app-vim/ferret/Manifest
+++ b/app-vim/ferret/Manifest
@@ -1,2 +1 @@
-DIST ferret-4.0.tar.gz 36867 BLAKE2B 0c386d5ad24fcd0662108e8e6005f94900c68099af0fedd181eb63d1c0f762ece02c0daf65dcbca1205b5c3c724ed73c523089da0b3db4f8c7f6d5aed737f113 SHA512 4d3e39a172a7ef26ddfd49e0582cb11f44851a486dd5ac298e54b9879966b5d09e2f9b0a76dfb5f30157035989ccc21269c3e5adbd5a4c8c7d0797bfe729eeb8
 DIST ferret-5.0.tar.gz 40975 BLAKE2B 75970b35852c5859ce53686eed9c8ba0d3d8599c9f53dc0a2a859dcdee8efd99fef298964db7cd9c2848180d87f45cb7e40a3352324b0530c5797647199a7f2f SHA512 882dc7d3baaa8a0e64244e8b7c3fef31088d4f89e49bf57dff85efc65f87fa6d3d8516ed3067dab4f4aa9857bb429e6f50d389d57a8895f6dab01db7e580867c
diff --git a/app-vim/ferret/ferret-4.0.ebuild b/app-vim/ferret/ferret-4.0.ebuild
deleted file mode 100644
index 016dd6866cfd..000000000000
--- a/app-vim/ferret/ferret-4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: enhanced multi-file search"
-HOMEPAGE="https://github.com/wincent/ferret"
-SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_prepare() {
-	default
-
-	rm -rv test.rb doc/.gitignore || die
-	# See bug 612282.
-	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
-}
diff --git a/app-vim/frawor/Manifest b/app-vim/frawor/Manifest
index a8f4b7fe7ef2..8b5248a9c8ee 100644
--- a/app-vim/frawor/Manifest
+++ b/app-vim/frawor/Manifest
@@ -1,2 +1 @@
 DIST frawor-0.2.3.tar.gz 125909 BLAKE2B d82ddea09bba7a8b0e70b5fedbc54b40357003fb5652cc6cd94d70e50467775deb204d3c40e369675d87acaac5c3ecaf09281d90566f1d545a55c9091116d9ab SHA512 230adb0442a8c488eb3560f4d0b2ca4f70116ca30308e2ab4621b266f90eb975b10b449e3c4bdfdacb71988ba2df5191b220ff69c40499f9fc28737973cd2017
-DIST frawor-0.2.3.tar.xz 257268 BLAKE2B 4409de0fb392841676eac2d794e0e44f64e3978dea1b72b807b7660a9feb1da3850a1ba651287f624830da4d1529daea60da2b76db37e422b6a4827e73dcf8d6 SHA512 ad8c6939875b5783b3faa0a3194e187161ba10f662a896f06ea86aebf12b172bd8d419b14a95c0d14aedfb38ebc5de73895d6d472db64dc15f567509e55188b2
diff --git a/app-vim/frawor/frawor-0.2.3.ebuild b/app-vim/frawor/frawor-0.2.3.ebuild
deleted file mode 100644
index 1f54b2217232..000000000000
--- a/app-vim/frawor/frawor-0.2.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: modular vim framework"
-HOMEPAGE="https://bitbucket.org/ZyX_I/frawor"
-SRC_URI="https://bitbucket.org/ZyX_I/${PN}/downloads/${P}.tar.xz"
-
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-# Tests rely on zsh. No.
-RESTRICT="test"
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index dce65e5f2d1d..56385baa04c1 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,5 +1 @@
-DIST fugitive-2.4.tar.gz 33340 BLAKE2B d5e5df47e0492510abae735dd47b51d797fe38862401f7d8e64404f6fa4e040641141c6febb13b05910cc44dc0372b084fe0ee8c3980a73d11d65e1a502ed627 SHA512 fb9d4129090bbafcace9400e9f21feae06bc9f903a54cfef7c4cbfa62856019a511b924c294e86fd26cd713d588ca0054a17d9676b59e2f406779ab5d51c3363
-DIST fugitive-2.5.tar.gz 39318 BLAKE2B 437f4c36b357937fc83e0107882d535c5cc9e609801147d1a48c28e16c4f964c221ff404301e57c9d740a04caf4cf5383a1f307ad89a76294e13b784561223bd SHA512 9a58ff3fa9eae72fca3d1232d01856ef56fe38b7bbf61be44ec4cdf4f0f69fca69fafe19266d657530a6d08f856236b1d1370bb770b14402bb7e476d5ca4bb78
-DIST fugitive-3.1.tar.gz 61142 BLAKE2B 15436725924d7ab09903973d77e9d7ce904f6bfaee451da2d3240236b2ef0589efd4b34e3673550749a6f021802018b2fb86f09ecdd727231f58bce3fd7c82b0 SHA512 4301e53a688ef1c822c146e04c41b6724cc38503733c622c0be8ea67ff2dd442f487fab8569bd3c8f7d97f6a4d5b42b58c0f23a216d74b862c09ed5c57f6ea87
-DIST fugitive-3.2.tar.gz 64708 BLAKE2B cab484ec66b7c54857856ed1f6cbebbf6d3fb1afdb35b004f72f8c06785a18d8810244255305cd949e25d1f78d734c46e400488526631b4070d3e0b104830552 SHA512 c7ac97d52f683a73545efddf33986dedecbae25208ebf0703dccf99cb46fd5020362f724c5b530aeca40467d9e864ce6597d6eb5eaa93a33643191e1aa5b44db
 DIST fugitive-3.4.tar.gz 80677 BLAKE2B 7cb341851248eb05a8094617f349e382cb8704f69116d8a00f07db40d96b4cc86b98515a59c489116fe7fdadb9a73a65819bf792005bda316f1a0bca311e6938 SHA512 313f1b06c843f85cfdbee059f1470b1ed062c2055e552fa1e05b01e59d9950c181b19e7553cbbca575b1951949970691081582128be7148885485d4fbed0a4d2
diff --git a/app-vim/fugitive/fugitive-2.4.ebuild b/app-vim/fugitive/fugitive-2.4.ebuild
deleted file mode 100644
index adb714120724..000000000000
--- a/app-vim/fugitive/fugitive-2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vim-plugin
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
-LICENSE="vim"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-2.5.ebuild b/app-vim/fugitive/fugitive-2.5.ebuild
deleted file mode 100644
index fe8da7842fc2..000000000000
--- a/app-vim/fugitive/fugitive-2.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit vim-plugin
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
-else
-	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
-	S="${WORKDIR}/vim-${P}"
-fi
-
-DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
-LICENSE="vim"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-3.1.ebuild b/app-vim/fugitive/fugitive-3.1.ebuild
deleted file mode 100644
index 0d4da8993529..000000000000
--- a/app-vim/fugitive/fugitive-3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit vim-plugin
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
-else
-	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
-	S="${WORKDIR}/vim-${P}"
-fi
-
-DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
-LICENSE="vim"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-3.2.ebuild b/app-vim/fugitive/fugitive-3.2.ebuild
deleted file mode 100644
index 0d4da8993529..000000000000
--- a/app-vim/fugitive/fugitive-3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit vim-plugin
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
-else
-	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
-	S="${WORKDIR}/vim-${P}"
-fi
-
-DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
-LICENSE="vim"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
index 5f8ef64794cb..baa65b10e5c7 100644
--- a/app-vim/gitgutter/Manifest
+++ b/app-vim/gitgutter/Manifest
@@ -1,3 +1,2 @@
-DIST gitgutter-20180316.tar.gz 46344 BLAKE2B f981753a0f8d066b7cb5c16c49cfdd1a1aac1c6623b4645b8b1abd5719470ac181e09c8b736f8b8a14e6098b60cb8f97b114dc5c2a587b6d1875fcf27b4b12cf SHA512 15873b2cccc49f8aec9de312efedc615d6fa822b45ca8ce53cc6cc878fcaf3a6ab3f02eb5d082ff329528cce1b48358846b0aba3f9d3bc8aadd29aa57d3b1a30
 DIST gitgutter-20180815.tar.gz 46741 BLAKE2B 85189390a2d8c5feaf8d2fabfd2c72bf79954fd1e9f2c3ffeca748e84caf13924f71ef5837ab62aef0ae003a01304305e73bbcb12dca27294c8164e960249fec SHA512 b6d3bd0f779d9afbd38df33888ab3ee0f1d8d10de0a6c5c6766f7f73a292cdd589a6774faa2871877075f6cedd29f14bba07c9a769d706e0e67d8817db86cfaa
 DIST gitgutter-20220524.tar.gz 602709 BLAKE2B c3199ebb66076f2ba08872ac610ff3818ce9f021219777326fe76620b7a923793576e693c6960056cdba3aee102538b4394e73c2f0972b387f669caef74304a2 SHA512 fb45b40f1a555a34d99436ef9f4d44a12438427c044b156119d319d374a98f3c18e6c5649adbda24c4e7a4db5e24cea29bd16e05188187e07ca331f65f3b8bfa
diff --git a/app-vim/gitgutter/gitgutter-20180316.ebuild b/app-vim/gitgutter/gitgutter-20180316.ebuild
deleted file mode 100644
index fb42081192e0..000000000000
--- a/app-vim/gitgutter/gitgutter-20180316.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vim-plugin
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
-	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
-HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
-LICENSE="MIT"
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
-
-src_prepare() {
-	default
-
-	# remove unwanted test dir
-	rm -r test || die
-}
diff --git a/app-vim/gitlog/Manifest b/app-vim/gitlog/Manifest
index fb1fdba0713c..87a6b83fe857 100644
--- a/app-vim/gitlog/Manifest
+++ b/app-vim/gitlog/Manifest
@@ -1,2 +1 @@
-DIST gitlog-5.1.0.tar.gz 29684 BLAKE2B 80d48890f25015c448a8acfd9ef9fb4da8e39ec61de0741d8fd9e33858a0696336b599b81ff379e0674a084d1bc80a6562721d963b4a5e60b611ff1fd741e867 SHA512 1c2bd363ce5341fcdaa80955af350084903da7e7cac1e20583d05f8812ef11e562137e2ef3bd198f787a6cc1e322f7d942135341c27186a7c987cd9d631a0eeb
 DIST gitlog-6.0.0.tar.gz 33956 BLAKE2B 5a7472db7cbf03396e3ed4e7eea417e44e538946d9432b4d94c3114b59bfeb961c6e0df4137c116f152b57986b7cbaa1aeacd59df33d709f2794f5d2607693c4 SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069
diff --git a/app-vim/gitlog/gitlog-5.1.0.ebuild b/app-vim/gitlog/gitlog-5.1.0.ebuild
deleted file mode 100644
index 4191208246b6..000000000000
--- a/app-vim/gitlog/gitlog-5.1.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: git log and diff plugin for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
-SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Artistic"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S=${WORKDIR}/vim${PN}-version_${PV}
diff --git a/app-vim/gitolite-syntax/Manifest b/app-vim/gitolite-syntax/Manifest
index 42b1c98be9f0..08145854f6d0 100644
--- a/app-vim/gitolite-syntax/Manifest
+++ b/app-vim/gitolite-syntax/Manifest
@@ -1,2 +1 @@
-DIST gitolite-syntax-20111225.tar.bz2 1833 BLAKE2B 3838617e7628685e20aaa25223d20ca3cc615449b38552b16b6750bbba5847f075f70b6e6858fdbb7e377a7332e6057da9527fd1a06ba56601b2c31b81f6ee4d SHA512 28cac71111f9d41c46e6f9f68a22760512a03650b5f1f2d77ef40e002c22c024a288ede2d6e898320d4616066409d5f8343688681169c136505235b784d3dda5
 DIST gitolite-syntax-20130306.tar.gz 2975 BLAKE2B 552f9c1e02a8089a9e6c7887f533ac6187a3d1425d0c916ca50a62076a8ee448ed4cdcb44a10d8df53ded724c68617c17ddbf7a87d935851466e441547bbeac7 SHA512 c064d06162bdb0b71d9c0638db073bba9b0577a1529eaac1a673b812fc08478e5b351954279d9d68947f0c4e3fe29ee5667741e6d229461d1ad1c7b2f535a49d
diff --git a/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild b/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild
deleted file mode 100644
index 94a9194a732d..000000000000
--- a/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: gitolite syntax highlighting"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2900"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-VIM_PLUGIN_HELPTEXT="Vim Syntax highlight for gitolite configuration file gitolite.conf"
diff --git a/app-vim/gnupg/Manifest b/app-vim/gnupg/Manifest
index 2d883828ebcc..3dcfa1158497 100644
--- a/app-vim/gnupg/Manifest
+++ b/app-vim/gnupg/Manifest
@@ -1,2 +1 @@
-DIST gnupg-2.6.tar.bz2 12074 BLAKE2B d06e4637627187e1d276c3b485e22b35f0cba78a491d34f0884da7ad320f12a3443e40a7c0e7e3f27be03984380eb966d593a283d768bb834a1fefed05656dd3 SHA512 1b7307954aad751006286edebb80767951b9bd9a8eff4c4a57fa6030cb442ceca12730a82c76a2181e1da19cc4cc8be21ccd4f8a21817aedf42785d8ff4b61ac
 DIST gnupg-2.7.1.zip 16131 BLAKE2B 82e29fd95adc5d6690409ec136086be2f0f358143de0bd6ad53c095d4cdcebe47f463f30cc5f494c441222380b5fac3291a9a6f7937f487ad28702ed3e175873 SHA512 07599e981e55d7eac7b06169e9ce30d33374b01680ad0317d5e4b51addce22b195dbd7a22a2adc381dfb89bd66aad9c377b43f36e6a5b32b7c577462b149e0a2
diff --git a/app-vim/gnupg/gnupg-2.6.ebuild b/app-vim/gnupg/gnupg-2.6.ebuild
deleted file mode 100644
index ef344bdcf3f9..000000000000
--- a/app-vim/gnupg/gnupg-2.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="transparent editing of gpg encrypted files"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3645"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="app-crypt/gnupg"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	default
-
-	# There's good documentation included with the script, but it's not
-	# in a helpfile. Since there's rather too much information to include
-	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
-	mkdir doc || die
-	sed -e '/" Section: Plugin header.\+$/,9999d' -e 's/^" \?//' \
-		-e 's/\(Name:\s\+\)\([^.]\+\)\.vim/\1*\2.txt*/' \
-		plugin/${PN}.vim \
-		> doc/${PN}.txt || die
-}
diff --git a/app-vim/lustyexplorer/Manifest b/app-vim/lustyexplorer/Manifest
index 3662898fd4e9..5feecc441291 100644
--- a/app-vim/lustyexplorer/Manifest
+++ b/app-vim/lustyexplorer/Manifest
@@ -1,2 +1 @@
 DIST lusty-explorer-5.0.zip 21036 BLAKE2B 6f9918242b5a12a2fd58017c54f10489113b21858e1522e0ff74a7cca41045c08144cb7b69bef2aa5e67998d74bb8472d547421cb737d2fdf79ec1ce4c51db9d SHA512 42aa2dea2d96c88cf65891a08a798c185849695c49663260fd133c34b63311d1db9073d3db2d6e4d1fd6907fdd4cf89335dacb0a5bbaa994924751f5a1be66cf
-DIST lustyexplorer-4.3.tar.bz2 17373 BLAKE2B 643eb4c7573932fa63030766670d7c398e307b72e08e93e53e31b7f21086a80196c8d4d7811032b8b945306fcdc7d86d59eb6b48ce0b79f38e628d6b4bec7519 SHA512 24ffa1fe5c1698dfa6093c7cfed2f08540ce130258df5e8ec135356ecea4c1f607f11e643ab859f551e63ecbbf6fc8a615a9514e1d4798b752cc97146c29c661
diff --git a/app-vim/lustyexplorer/lustyexplorer-4.3-r1.ebuild b/app-vim/lustyexplorer/lustyexplorer-4.3-r1.ebuild
deleted file mode 100644
index 18e37c2dd2f7..000000000000
--- a/app-vim/lustyexplorer/lustyexplorer-4.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
-LICENSE="bufexplorer.vim"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="lusty-explorer.txt"
-
-RDEPEND="|| (
-	app-editors/vim[ruby]
-	app-editors/gvim[ruby]
-)"
-
-src_prepare() {
-	default
-
-	# There's good documentation included with the script, but it's not
-	# in a helpfile. Since there's rather too much information to include
-	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
-	mkdir "${S}"/doc || die
-	sed -e '0,/"$/d' -e '/" GetLatest.\+$/,9999d' -e 's/^" \?//' \
-		-e "s/\(Name Of File: \)\([^.]\+\)\.vim/\1*\2.txt*/" \
-		plugin/lusty-explorer.vim > doc/lusty-explorer.txt
-}
diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index f726ade47058..289953725a3c 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,2 +1 @@
-DIST merginal-2.1.0.tar.gz 13510 BLAKE2B c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96 SHA512 3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
 DIST merginal-2.1.2.tar.gz 15156 BLAKE2B a8181ebd7aa67663b4541b5cb5028b6cadcca68c48f325dca07308ad13554d1d4b96b53f0a30e516cea732c880e68cb7e4cb7836b72cbd6b59a009e8d3c744b2 SHA512 70da5529ee22b3f06d83ecac62634d46d30472f064613a1844a7cdae31ed97366b5fcf6b31f4becd4cde246ccac32be6528c8c93ee2f02bdd32932388282f9bf
diff --git a/app-vim/merginal/merginal-2.1.0.ebuild b/app-vim/merginal/merginal-2.1.0.ebuild
deleted file mode 100644
index 4632645f0291..000000000000
--- a/app-vim/merginal/merginal-2.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-MY_PN=vim-${PN}
-MY_P=${MY_PN}-${PV}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/idanarye/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
-LICENSE="vim"
-
-RDEPEND="app-vim/fugitive"
-
-VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/nerdtree/Manifest b/app-vim/nerdtree/Manifest
index 48508f76932d..47d45c816285 100644
--- a/app-vim/nerdtree/Manifest
+++ b/app-vim/nerdtree/Manifest
@@ -1,3 +1 @@
-DIST nerdtree-5.0.0.tar.gz 56162 BLAKE2B d4451ae6968454c6281e63233db13f0c5c834eab1a69662b2850d0cfa91f7255a51cbe5113c16224a57eef86862a032607c6eb1a7cc300af169491ce40e9cebe SHA512 7de6e7978604e89e2c03cadf74ff4a57545ff73a643039fdfe76f277e773374b5b5f9bbd5d8f3307df4af867f88fc687f9bb5e28ff9e90d11fecdef8bdb83d1a
-DIST nerdtree-6.4.1.tar.gz 157828 BLAKE2B dad6ea998a158405d7c0937be42c190839d5ebf6ec5ae9342905a93eeaeefda7d68f3a69f9797efcdb54ba446d0e497f1c7aeb7db6738e0af0e3ccd326e1617b SHA512 574041237f66e0d7c4d704b866216d051a7eddd8a4842f0aa4a131d06158c82352ef6b94c171666e73a72e8812e38de4197277b51e1f6cec562f9f3c916bf66a
 DIST nerdtree-6.4.3.tar.gz 158308 BLAKE2B 49c5014f76c19ccec2a42812d70c1e4186ce0f918ca483e340679b59680d49dfe3ac5488075af9d84d5122a89f8b972f5270ae7a6c4d8756edd0c01554a341ef SHA512 ea4ba39c67817589ab0e64192ab1889f9f0b7eeb1ccb85c5d2b4141e8759ef7e6ee9822e0ea3bdcdb9a7141ffe9e70af1c3f462a06f8c76c3234f07f5750518d
diff --git a/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild b/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild
deleted file mode 100644
index af29a2499dea..000000000000
--- a/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
-SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="WTFPL-2"
-KEYWORDS="amd64 x86 ~x64-macos"
-
-VIM_PLUGIN_HELPFILES="NERD_tree"
diff --git a/app-vim/nerdtree/nerdtree-6.4.1.ebuild b/app-vim/nerdtree/nerdtree-6.4.1.ebuild
deleted file mode 100644
index 6bbf91b46b50..000000000000
--- a/app-vim/nerdtree/nerdtree-6.4.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
-SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="WTFPL-2"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-VIM_PLUGIN_HELPFILES="NERD_tree"
-
-DOCS=( CHANGELOG.md README.markdown )
diff --git a/app-vim/perl-support/Manifest b/app-vim/perl-support/Manifest
index 6d3b77d6492f..2e72e5be5bfe 100644
--- a/app-vim/perl-support/Manifest
+++ b/app-vim/perl-support/Manifest
@@ -1,2 +1 @@
-DIST perl-support-5.3.2.tar.bz2 178598 BLAKE2B d02aae9d65e9f0d5274cbeb44db1ed7de844ef87fa73fd8bfe8c27ccd27584e1937d9a0a824e6f10013554c8259307ebd73d3f188b98897709b1d5d2a03ca548 SHA512 1eff321b0c5184b58737e79de379fbe431b32fbe5a140914b950d024ee9b512393b46cf4e45cafe50289ee9f9d4747984534efeade399882a17237a1a1ca1161
 DIST perl-support-5.4.tar.gz 267155 BLAKE2B 1144623092164bcf436e789d2ea587c08916aafd1514facf28696b23035feeacada610c8f9d4f9c45f29bdea32b9f9b7a3151b918cf08839e10caadb0485cc9d SHA512 d9d06ea2299be6135b5423aa7f062874736d7aa8118428a9abcd20c53eea410f0d384d0a79324e5ad0101105aa0aa10eb23f031084f34908f879633e5d18c795
diff --git a/app-vim/perl-support/perl-support-5.3.2.ebuild b/app-vim/perl-support/perl-support-5.3.2.ebuild
deleted file mode 100644
index 86cf2b265565..000000000000
--- a/app-vim/perl-support/perl-support-5.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=556"
-LICENSE="GPL-2 GPL-2+"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-VIM_PLUGIN_HELPFILES="perlsupport.txt"
-
-RDEPEND="
-	dev-perl/Perl-Tags
-	dev-perl/Perl-Critic"
-
-src_prepare() {
-	# Don't set tabstop and shiftwidth
-	sed -i '/=4/s/^/"/' ftplugin/perl.vim || die
-	default
-}
-
-src_install() {
-	dodoc ${PN}/doc/{ChangeLog,perl-hot-keys.pdf}
-	rm -r ${PN}/doc/ || die
-
-	vim-plugin_src_install
-}
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 14d785488a78..28aebdd62d1e 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,2 +1 @@
 DIST splice-1.1.0-github.tar.gz 15821 BLAKE2B 37c402e7961471dd21e443550b4005cd98eab7a58d4b1d33f8522ac6fb180c6ce18f78174338c98fb63f5e7881d529c6f0d67d52bf40f357e530c404741a2d8f SHA512 3bd9a97522ec3fab08bd41e8e58b54ff0bb1a1f42251bd17c53057d6e5a1266bfff8683d47f85a83d84547bba2a8ea0682fe74da3cb06dc567271dd9ab5c4080
-DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
diff --git a/app-vim/splice/splice-1.1.0-r3.ebuild b/app-vim/splice/splice-1.1.0-r3.ebuild
deleted file mode 100644
index f1d5e4025c5a..000000000000
--- a/app-vim/splice/splice-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,36 +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 vim-plugin python-single-r1 vcs-snapshot
-
-DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
-HOMEPAGE="https://docs.stevelosh.com/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026"
-SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
-		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
-	)"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	default
-	rm -r site || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	vim-plugin_src_install
-	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
-}
diff --git a/app-vim/tlib/Manifest b/app-vim/tlib/Manifest
index 4bc1f53d28a5..88e5dff1fd9f 100644
--- a/app-vim/tlib/Manifest
+++ b/app-vim/tlib/Manifest
@@ -1,3 +1 @@
-DIST tlib-1.22.tar.gz 119979 BLAKE2B 2fe1231b6a075989c41aa2cf38d0964b6d9ada390d0729ea417aa1c2ef1a105a07d569f80c75ba91a55f7e68f349faab2dcda66741b0b1da59f76d68a5467e24 SHA512 b7fc7e3741876c92bbccc116d4e170663e3d178aa8fb546f969475723cd82e07d9470af37574f8f97cfd23b8ca8f5dd5daa2e7bef50e2f62beec0015a2355908
-DIST tlib-1.23.tar.gz 120827 BLAKE2B 7b86a1b0e22e499390239e5898d81c90ac1b3b989b929e3bde3ea516d05419fc8af19e72d5313df36ce856a4c7ee2cddbdbecbace835f24adefb1883d4e76e46 SHA512 5fd5d6e6ccd36117abcfca35173d28602a73b0773e5fc77cb8c1c8660f13dd7882c8a8de9b4335927b807c7d643c480f1371926b4ffb1758e53948132dee1d75
 DIST tlib-1.27.tar.gz 124891 BLAKE2B d8d79d1d7bc71e38d2315ab30df414521122cae8c8dfe2e43c8e87bad30685703e09a905d97a00cc2ef01a51369acfde75c37290d971a72d40ec61bce8f1fe31 SHA512 c7037a4aaa4bbb1fede9baea45644a8d1575c5813bc387a293856d8acbe2929cb641d317a4323b295dcc1c0e05091984e6b6eb9a3968503c4cde53580baf994d
diff --git a/app-vim/tlib/tlib-1.22.ebuild b/app-vim/tlib/tlib-1.22.ebuild
deleted file mode 100644
index 20d865bba5ad..000000000000
--- a/app-vim/tlib/tlib-1.22.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-MY_PN=${PN}_vim
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="vim plugin: a library of utility functions"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim"
-SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( README CHANGES.TXT )
-
-src_prepare() {
-	default
-	rm -r test samples || die
-}
diff --git a/app-vim/tlib/tlib-1.23.ebuild b/app-vim/tlib/tlib-1.23.ebuild
deleted file mode 100644
index debbec9d3ea2..000000000000
--- a/app-vim/tlib/tlib-1.23.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-MY_PN=${PN}_vim
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="vim plugin: a library of utility functions"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim"
-SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( README CHANGES.TXT )
-
-src_prepare() {
-	default
-	rm -r test samples || die
-}
diff --git a/app-vim/txtfmt/Manifest b/app-vim/txtfmt/Manifest
index 8d5df030d925..af92edbc7230 100644
--- a/app-vim/txtfmt/Manifest
+++ b/app-vim/txtfmt/Manifest
@@ -1,2 +1 @@
-DIST txtfmt-2.4.tar.gz 127123 BLAKE2B c7623a462ae9a2562b9455ca94b013bc1555bb13d50b37f0edc27a297a420d24462e0f6a8140c8e18fd89ec400276b3fdbb5f76ea164f2e857f3849bf232c9f7 SHA512 4f3a32c34b11477a7b78fca47367754093b04dbe60bdfee16d2f05c992a82f9f64fb82b8dc811afd43fd4206f426c88ade95943cc1686e6bf57813596b9652f8
 DIST txtfmt-3.1.tar.gz 172348 BLAKE2B aa44aef49665f034dcb0528bc6795f716540088b59e026bb079e49e5d2b9f6034f99afa220cb63b7e534257e2fc249c779b2ad0fb8ef01d3fa99e609b70e059e SHA512 bdef5350626ee5251fbf3cb4a4270e72f0b8ab29948f0469cfadbcf0735ccd7c104b34a25e43d4ff147ed48de3667fba472080f81f72d5a4687467e5c44af5d1
diff --git a/app-vim/txtfmt/txtfmt-2.4-r1.ebuild b/app-vim/txtfmt/txtfmt-2.4-r1.ebuild
deleted file mode 100644
index d570eeb05132..000000000000
--- a/app-vim/txtfmt/txtfmt-2.4-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: rich text highlighting in vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2208"
-SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=13856 -> ${P}.tar.gz"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S=${WORKDIR}
diff --git a/app-vim/unite/Manifest b/app-vim/unite/Manifest
index 96ca02dc8722..6b8c4423b02a 100644
--- a/app-vim/unite/Manifest
+++ b/app-vim/unite/Manifest
@@ -1,2 +1 @@
-DIST unite-4.0.tar.bz2 80472 BLAKE2B 8150ac276f4e64458f3ab08dc48ddb4167a36162bdb291e59fb376e2a061b80f1760a195667a2794a7657f32367714dd60874cfcd2c363366dcbfde07a3224f0 SHA512 e554e48d740b0ce6406d8512a0c769e25f78b763d267bbbf8228197835b724154f33452571c771fede1415a9b3108deb096e3bc90291a95e8a3b00d216287928
 DIST unite-4.1.tar.bz2 85622 BLAKE2B 58f4d4ac86fcf588ab0e3ecdb45dd67d0c16c67be2f6daff21f9d4451b94c9094671f4248cc6f4b39e5a292418908536cb222288dd344d56f9b98b09f5263eb3 SHA512 1fb19cfaf1b49843c79e2b9ff8e318b950dc1b65144f83a76776963a598e666f3094dc7f65f2708d7e074f8197121cee77e028a07c5735998f73f2d52d08c9ca
diff --git a/app-vim/unite/unite-4.0-r1.ebuild b/app-vim/unite/unite-4.0-r1.ebuild
deleted file mode 100644
index 8c036e471faa..000000000000
--- a/app-vim/unite/unite-4.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: unite all sources"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3396"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="!app-vim/neocomplcache"
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
index 894d11ac03ce..2a369c5b3955 100644
--- a/app-vim/vim-go/Manifest
+++ b/app-vim/vim-go/Manifest
@@ -1,3 +1 @@
-DIST vim-go-1.13.tar.gz 870173 BLAKE2B a2f67cef249191cf91caf45c120e471301a89ee365ba9add839edea17990ff3aba7238965dac1c71a89d2004dfcfd486319fc4f1474c7ee94d3845724cd9b289 SHA512 c2aa31104168f3a8e1f96b0ad2c51dc1c2e5a1de3db76f0009edfb38bf60ebfcd9bd8a86fedb6ff6d6d789973a557d6ed03e38e67159bc43c5231449b0253c25
-DIST vim-go-1.19.tar.gz 218988 BLAKE2B 3bbafde28342b8febc8763fe9858575abc8f3e9735f3886de508cb7986bd97d1d2eeb36bdd4eb9b2f514e74f47b08355549e32c101519dac41427f302f57e29f SHA512 fc2cdcbc58878ab435c6b253a226e46ca60083bfd4e6df683e1dbeb368bb25b10fc531630a6b1f6cbfc32306a255eb6eae6bcc3f7a7b770758d4beb71c539f77
 DIST vim-go-1.20.tar.gz 232322 BLAKE2B f72664c79d781152748b6d5e48e9363a924e257eb0054931127d83fe4dc56d5b3e3592800ae3be3812609ec92c9b66fbcba8a1b1ca76891573408db14a0b2865 SHA512 1f5499dd33b72466127c1fbbd7a10dca41d9e8c3add6a0b2b3efa8dc0caf2aaa26311357a5b5eaecf2461a3465aabbf608a9ca35203139ead083bbcc806ea552
diff --git a/app-vim/vim-go/vim-go-1.13.ebuild b/app-vim/vim-go/vim-go-1.13.ebuild
deleted file mode 100644
index ad5a3b542300..000000000000
--- a/app-vim/vim-go/vim-go-1.13.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Go development plugin for Vim"
-HOMEPAGE="https://github.com/fatih/vim-go"
-SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-RESTRICT="test"
-
-DOCS=( README.md CHANGELOG.md )
-
-src_compile() {
-	# safely skip `make test` triggered by `make` as it runs `go get` commands
-	# TODO: see :GoInstallBinaries (https://github.com/fatih/vim-go/blob/master/doc/vim-go.txt)
-	:;
-}
diff --git a/app-vim/vim-go/vim-go-1.19.ebuild b/app-vim/vim-go/vim-go-1.19.ebuild
deleted file mode 100644
index 9bed778af92e..000000000000
--- a/app-vim/vim-go/vim-go-1.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Go development plugin for Vim"
-HOMEPAGE="https://github.com/fatih/vim-go"
-SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-RESTRICT="test"
-
-DOCS=( README.md CHANGELOG.md )
-
-src_compile() {
-	# safely skip `make test` triggered by `make` as it runs `go get` commands
-	# TODO: see :GoInstallBinaries (https://github.com/fatih/vim-go/blob/master/doc/vim-go.txt)
-	:;
-}
diff --git a/app-vim/vim-nftables/Manifest b/app-vim/vim-nftables/Manifest
index 557831dac591..eacdd03fa2d9 100644
--- a/app-vim/vim-nftables/Manifest
+++ b/app-vim/vim-nftables/Manifest
@@ -1,2 +1 @@
-DIST vim-nftables-0_pre20200224.tar.gz 2427 BLAKE2B a17780ffcabd1d323f3ccaa52e9726c2d8dc04583003fd8eaa799c897d1ccb1718a2ef28c2c06f0108785bdcc90addfb27d54f73db8d9f59b225e34c244cf179 SHA512 05dab5d9bdaed4ae1de9e00f2d6996f4350d859af73062d00417ee6567041c0a3fa6f50996fefa64e7a2410779b254ddeac1d5a893aa2f664504278b67fa2fd9
 DIST vim-nftables-0_pre20200629.tar.gz 2440 BLAKE2B 39a80bfa54b378896918f3703edd452cc3d9d15d15bc6545dfeda362726e8dc1bcfb1f2008d5c1236f24b01dbc17df59ea14928550a3567b57c74407c7e97d73 SHA512 71ddc55158b7461dc71730f76c84ba4cf76490afe0c5323502341e97d7173a1607e9cc70e6a552cfb7491e485352c837d0aa2e6f9c46e81ef525bedc88e389ef
diff --git a/app-vim/vim-nftables/vim-nftables-0_pre20200224.ebuild b/app-vim/vim-nftables/vim-nftables-0_pre20200224.ebuild
deleted file mode 100644
index de0e056a2365..000000000000
--- a/app-vim/vim-nftables/vim-nftables-0_pre20200224.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-COMMIT_ID="01c7b97eff12fd4b624e6efa2c0468163db61ebc"
-
-DESCRIPTION="vim plugin: nftables syntax and indent"
-HOMEPAGE="https://github.com/nfnty/vim-nftables"
-SRC_URI="https://github.com/nfnty/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vimcdoc/Manifest b/app-vim/vimcdoc/Manifest
index 73d9ee52f9ad..40bc09682e21 100644
--- a/app-vim/vimcdoc/Manifest
+++ b/app-vim/vimcdoc/Manifest
@@ -1,2 +1 @@
-DIST vimcdoc-1.9.0.tar.gz 1969682 BLAKE2B 296fb6f246d92f8c5aa917bdc68870d568892cc2a64158121f7c69878ea8e3bdcfbe1f8b060dca11e24e0fad7ab0cfbe4db8e3d756e7f4715bfc72b32c3d2ef7 SHA512 f12e6e12d481d6cf718c97aecc1619c11d5c19ef647155ed66c8c6b79f7a82ca36249e7f60aeb246404dbb31c68eced135c53247f0d99acaf05bc8e7a5679fc9
 DIST vimcdoc-2.1.0.tar.gz 2228306 BLAKE2B 099727487067f5ff1e28ab1d8562edc6377984e557c9fa8b467102cd7df069f6bfed7d2149c59f8b5d8aa6e2352905533cdc6c6c1869a8e2494c4b1601df6056 SHA512 31df2f9b37d0fe00205afc66a920633fae770bca569c3d71376cc4b27af42f6f8bd6aa9f997b5007bad65ca4525a1847e396b64083ca7dd12748153e4d216096
diff --git a/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild b/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild
deleted file mode 100644
index 5eec3b7044fb..000000000000
--- a/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="online vim documentation translated into Chinese"
-HOMEPAGE="http://vimcdoc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="vim.org"
-KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index d55388302906..ec9967cb7aa2 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,2 +1 @@
-DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
deleted file mode 100644
index e3ce492cd281..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easy and fast outlining"
-HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
-	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
-	find "${S}" -type f -exec chmod a+r {} \; || die
-}
diff --git a/app-vim/yankring/yankring-19.0.ebuild b/app-vim/yankring/yankring-19.0.ebuild
deleted file mode 100644
index 214878490ff4..000000000000
--- a/app-vim/yankring/yankring-19.0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: maintains a history of previous yanks and deletes"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1234"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 8eb522c0517f..2df7808f6d3f 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/mail-lib/mail-lib-1.85.ebuild b/app-xemacs/mail-lib/mail-lib-1.85.ebuild
index fef657b15031..592adc8d0d85 100644
--- a/app-xemacs/mail-lib/mail-lib-1.85.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.85.ebuild
@@ -15,6 +15,6 @@ app-xemacs/fsf-compat
 app-xemacs/sh-script
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/metadata.xml b/app-xemacs/mail-lib/metadata.xml
index e6bc34a5c39f..218065eeca5b 100644
--- a/app-xemacs/mail-lib/metadata.xml
+++ b/app-xemacs/mail-lib/metadata.xml
@@ -5,4 +5,5 @@
     <email>xemacs@gentoo.org</email>
     <name>Gentoo XEmacs project</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-xemacs/mmm-mode/metadata.xml b/app-xemacs/mmm-mode/metadata.xml
index e6bc34a5c39f..218065eeca5b 100644
--- a/app-xemacs/mmm-mode/metadata.xml
+++ b/app-xemacs/mmm-mode/metadata.xml
@@ -5,4 +5,5 @@
     <email>xemacs@gentoo.org</email>
     <name>Gentoo XEmacs project</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
index 9638ba5d00cf..3912e55390a3 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
@@ -12,6 +12,6 @@ XEMACS_EXPERIMENTAL="true"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/metadata.xml b/app-xemacs/prog-modes/metadata.xml
index e6bc34a5c39f..218065eeca5b 100644
--- a/app-xemacs/prog-modes/metadata.xml
+++ b/app-xemacs/prog-modes/metadata.xml
@@ -5,4 +5,5 @@
     <email>xemacs@gentoo.org</email>
     <name>Gentoo XEmacs project</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-xemacs/prog-modes/prog-modes-2.34.ebuild b/app-xemacs/prog-modes/prog-modes-2.34.ebuild
index d1306da775c3..75a5235c1343 100644
--- a/app-xemacs/prog-modes/prog-modes-2.34.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.34.ebuild
@@ -27,6 +27,6 @@ app-xemacs/cedet-common
 app-xemacs/w3
 app-xemacs/gnus
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/w3/metadata.xml b/app-xemacs/w3/metadata.xml
index e6bc34a5c39f..218065eeca5b 100644
--- a/app-xemacs/w3/metadata.xml
+++ b/app-xemacs/w3/metadata.xml
@@ -5,4 +5,5 @@
     <email>xemacs@gentoo.org</email>
     <name>Gentoo XEmacs project</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-xemacs/w3/w3-1.42.ebuild b/app-xemacs/w3/w3-1.42.ebuild
index 2a8658bc0db2..ed1fd955b921 100644
--- a/app-xemacs/w3/w3-1.42.ebuild
+++ b/app-xemacs/w3/w3-1.42.ebuild
@@ -18,6 +18,6 @@ app-xemacs/sh-script
 app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xwem/metadata.xml b/app-xemacs/xwem/metadata.xml
index e6bc34a5c39f..218065eeca5b 100644
--- a/app-xemacs/xwem/metadata.xml
+++ b/app-xemacs/xwem/metadata.xml
@@ -5,4 +5,5 @@
     <email>xemacs@gentoo.org</email>
     <name>Gentoo XEmacs project</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-xemacs/xwem/xwem-1.27.ebuild b/app-xemacs/xwem/xwem-1.27.ebuild
index 4f66315af2fb..b1f31de571ef 100644
--- a/app-xemacs/xwem/xwem-1.27.ebuild
+++ b/app-xemacs/xwem/xwem-1.27.ebuild
@@ -21,6 +21,6 @@ app-xemacs/ilisp
 app-xemacs/mail-lib
 app-xemacs/apel
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 
 inherit xemacs-packages
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index cf1dcf9d8f85..059cbeed239f 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/pstreams/pstreams-1.0.1.ebuild b/dev-cpp/pstreams/pstreams-1.0.1.ebuild
index e95044c86695..9f2d12528d54 100644
--- a/dev-cpp/pstreams/pstreams-1.0.1.ebuild
+++ b/dev-cpp/pstreams/pstreams-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ BDEPEND="doc? ( app-doc/doxygen )"
 src_compile() {
 	if use doc; then
 		doxygen -u || die
-		emake
+		emake docs
 	fi
 }
 
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 1d04e7937364..68058da8b910 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch b/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch
new file mode 100644
index 000000000000..79765787de52
--- /dev/null
+++ b/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/746770
+--- a/cmake/modules/c_flags.cmake
++++ b/cmake/modules/c_flags.cmake
+@@ -50,5 +50,4 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+     add_cflag_if_supported("-O0")
+ else ()
+     add_cflag_if_supported("-O2")
+-    add_cflag_if_supported("-Werror")
+ endif ()
+--- a/doc/dev/app-example/CMakeLists.txt
++++ b/doc/dev/app-example/CMakeLists.txt
+@@ -14,7 +14,7 @@ include_directories(${STLINK_INCLUDE_DIRS})
+ find_package(PkgConfig)
+ pkg_check_modules(STLINK REQUIRED stlink)
+ 
+-set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall -Werror")
++set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall")
+ 
+ add_executable(${PROJECT_NAME} ${SRCS})
+ 
diff --git a/dev-embedded/stlink/stlink-1.7.0.ebuild b/dev-embedded/stlink/stlink-1.7.0.ebuild
index e937418ed74f..6f33c17ee856 100644
--- a/dev-embedded/stlink/stlink-1.7.0.ebuild
+++ b/dev-embedded/stlink/stlink-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,6 +24,10 @@ RDEPEND="virtual/libusb:1
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-no-werror.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a3dff68e2076..65d767e017e7 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/gson/gson-2.9.0-r1.ebuild b/dev-java/gson/gson-2.9.0-r1.ebuild
index 655185099b31..d2927657733d 100644
--- a/dev-java/gson/gson-2.9.0-r1.ebuild
+++ b/dev-java/gson/gson-2.9.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="2.9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 DEPEND="
 	virtual/jdk:11
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
index 238bb9080267..a6c7d5119fea 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
 IUSE="doc"
 
 # tests require ton of java deps we don't have packaged/working
diff --git a/dev-java/reflections/reflections-0.9.12-r2.ebuild b/dev-java/reflections/reflections-0.9.12-r2.ebuild
index 64c3642c4eff..aa3b4c74c74e 100644
--- a/dev-java/reflections/reflections-0.9.12-r2.ebuild
+++ b/dev-java/reflections/reflections-0.9.12-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="WTFPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f0f5b273c423..ce466b0d06a0 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/R/R-4.2.0.ebuild b/dev-lang/R/R-4.2.0.ebuild
index 28e62a99b24d..5607e2ee1643 100644
--- a/dev-lang/R/R-4.2.0.ebuild
+++ b/dev-lang/R/R-4.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8c4f4e615ac3..001d518014f3 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index 309b58690364..b720c446dac0 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,2 +1 @@
-DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
diff --git a/dev-libs/libtermkey/libtermkey-0.20.ebuild b/dev-libs/libtermkey/libtermkey-0.20.ebuild
deleted file mode 100644
index 6dd0ea0eb31e..000000000000
--- a/dev-libs/libtermkey/libtermkey-0.20.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
-HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
-SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="demos static-libs"
-
-RDEPEND="dev-libs/unibilium:="
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	demos? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	default
-
-	if ! use demos; then
-		sed -e '/^all:/s:$(DEMOS)::' -i Makefile || die
-	fi
-}
-
-src_compile() {
-	append-flags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/${PN}.la || die
-}
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 1d79926b78ff..09c469292b13 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -2,4 +2,7 @@ DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b384
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
+DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081 SHA512 577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
+DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
+DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
diff --git a/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch b/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch
new file mode 100644
index 000000000000..c837e208cf6a
--- /dev/null
+++ b/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch
@@ -0,0 +1,21 @@
+https://github.com/openssl/openssl/issues/7679
+
+--- a/Configurations/unix-Makefile.tmpl
++++ b/Configurations/unix-Makefile.tmpl
+@@ -77,8 +77,14 @@
+      # to. You're welcome.
+      sub dependmagic {
+          my $target = shift;
+-
+-         return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
++		  my $magic = <<"_____";
++$target: build_generated depend
++		 \$(MAKE) _$target
++_$target
++_____
++		 # Remove line ending
++		 $magic =~ s|\R$||;
++		 return $magic;
+      }
+      '';
+ -}
diff --git a/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch b/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch
new file mode 100644
index 000000000000..c94b0323eb43
--- /dev/null
+++ b/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch
@@ -0,0 +1,61 @@
+From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Thu, 29 Aug 2019 13:56:21 -0700
+Subject: [PATCH] Add support for io_pgetevents_time64 syscall
+
+32-bit architectures that are y2038 safe don't include syscalls that use
+32-bit time_t. Instead these architectures have suffixed syscalls that
+always use a 64-bit time_t. In the case of the io_getevents syscall the
+syscall has been replaced with the io_pgetevents_time64 syscall instead.
+
+This patch changes the io_getevents() function to use the correct
+syscall based on the avaliable syscalls and the time_t size. We will
+only use the new 64-bit time_t syscall if the architecture is using a
+64-bit time_t. This is to avoid having to deal with 32/64-bit
+conversions and relying on a 64-bit timespec struct on 32-bit time_t
+platforms. As of Linux 5.3 there are no 32-bit time_t architectures
+without __NR_io_getevents. In the future if a 32-bit time_t architecture
+wants to use the 64-bit syscalls we can handle the conversion.
+
+This fixes build failures on 32-bit RISC-V.
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/9819)
+---
+ engines/e_afalg.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/engines/e_afalg.c b/engines/e_afalg.c
+index dacbe358cb..99516cb1bb 100644
+--- a/engines/e_afalg.c
++++ b/engines/e_afalg.c
+@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
+                                struct io_event *events,
+                                struct timespec *timeout)
+ {
++#if defined(__NR_io_getevents)
+     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#elif defined(__NR_io_pgetevents_time64)
++    /* Let's only support the 64 suffix syscalls for 64-bit time_t.
++     * This simplifies the code for us as we don't need to use a 64-bit
++     * version of timespec with a 32-bit time_t and handle converting
++     * between 64-bit and 32-bit times and check for overflows.
++     */
++    if (sizeof(timeout->tv_sec) == 8)
++        return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL);
++    else {
++        errno = ENOSYS;
++        return -1;
++    }
++#else
++# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64."
++#endif
+ }
+ 
+ static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
+-- 
+2.26.2
+
diff --git a/dev-libs/openssl-compat/metadata.xml b/dev-libs/openssl-compat/metadata.xml
index bac0f2af8887..51593722cef0 100644
--- a/dev-libs/openssl-compat/metadata.xml
+++ b/dev-libs/openssl-compat/metadata.xml
@@ -13,6 +13,7 @@
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
  <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
+ <flag name="weak-ssl-ciphers">Build support for SSL/TLS ciphers that are considered "weak"</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1o.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1o.ebuild
new file mode 100644
index 000000000000..20a03ddac7fa
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1o.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+
+MY_P=openssl-${PV/_/-}
+DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN/-compat}/${P/-compat}-test-fixes-expiry.patch.xz
+	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="openssl"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!=dev-libs/openssl-1.1.1*:0
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
+
+# Do not install any docs
+DOCS=()
+
+PATCHES=(
+	# General patches which are suitable to always apply
+	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+	"${FILESDIR}"/${PN/-compat}-1.1.0j-parallel_install_fix.patch # bug #671602
+	"${FILESDIR}"/${PN/-compat}-1.1.1i-riscv32.patch
+	"${WORKDIR}"/${P/-compat}-test-fixes-expiry.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P/-compat}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# - Make sure the man pages are suffixed (bug #302165)
+	# - Don't bother building man pages if they're disabled
+	# - Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (bug #141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	local ec_nistp_64_gcc_128
+
+	# Disable it for now though (bug #469976)
+	# echo "__uint128_t i;" > "${T}"/128.c
+	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	# fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		${ec_nistp_64_gcc_128}
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl sslv3 ssl3)
+		$(use_ssl sslv3 ssl3-method)
+		$(use_ssl asm)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl tls-heartbeat heartbeats)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.$(ver_cut 1-2 "${SLOT}")
+}
diff --git a/dev-libs/openssl/openssl-1.1.1o-r1.ebuild b/dev-libs/openssl/openssl-1.1.1o-r1.ebuild
new file mode 100644
index 000000000000..0e55dcc43e49
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1o-r1.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+
+MY_P=${P/_/-}
+DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
+	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+if [[ ${PV} != *_pre* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
+PDEPEND="app-misc/ca-certificates"
+
+# force upgrade to prevent broken login, bug #696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+	# General patches which are suitable to always apply
+	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+	"${WORKDIR}"/${P}-test-fixes-expiry.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# - Make sure the man pages are suffixed (bug #302165)
+	# - Don't bother building man pages if they're disabled
+	# - Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (bug #141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	local ec_nistp_64_gcc_128
+
+	# Disable it for now though (bug #469976)
+	# echo "__uint128_t i;" > "${T}"/128.c
+	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	# fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		${ec_nistp_64_gcc_128}
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl sslv3 ssl3)
+		$(use_ssl sslv3 ssl3-method)
+		$(use_ssl asm)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl tls-heartbeat heartbeats)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
+	dodir /usr
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*}
+		d=${d#./}
+		m=${m##*/}
+
+		[[ ${m} == openssl.1* ]] && continue
+
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+
+		mv ${d}/{,ssl-}${m} || die
+
+		# Fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
+		ln -s ssl-${m} ${d}/openssl-${m}
+
+		# Locate any symlinks that point to this man page
+		# We assume that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+
+			rm -f ${d}/${s}
+
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-3.0.3.ebuild b/dev-libs/openssl/openssl-3.0.3.ebuild
index 8f5264ad9e35..23cddb4f6b9b 100644
--- a/dev-libs/openssl/openssl-3.0.3.ebuild
+++ b/dev-libs/openssl/openssl-3.0.3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
 inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
 
 DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
@@ -18,7 +19,6 @@ else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
@@ -92,6 +92,7 @@ src_unpack() {
 
 	default
 }
+
 src_prepare() {
 	# Allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
@@ -216,9 +217,7 @@ multilib_src_configure() {
 		threads
 	)
 
-	CFLAGS= LDFLAGS= edo \
-		./${config} \
-		"${myeconfargs[@]}"
+	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
 
 	# Clean out hardcoded flags that openssl uses
 	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
@@ -286,7 +285,9 @@ multilib_src_install_all() {
 	cd "${ED}"/usr/share/man || die
 	local m d s
 	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		d=${m%/*}
+		d=${d#./}
+		m=${m##*/}
 
 		[[ ${m} == openssl.1* ]] && continue
 
@@ -302,6 +303,7 @@ multilib_src_install_all() {
 		# We assume that any broken links are due to the above renaming
 		for s in $(find -L ${d} -type l) ; do
 			s=${s##*/}
+
 			rm -f ${d}/${s}
 
 			# We don't want to "|| die" here
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index ce2aa81fb9bd..765f7180a8a9 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1,3 +1 @@
-DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172
-DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443fc9bd723cade53a3d38dde3d66ee3d7374f7c69b85508a59d44d936601b24f33b01d923e55677d2bac71bd520fea SHA512 c0074ff8431f82c92072b8c0c9d3cf38d759b4de996b168c6ab00e475b0a6204d9c29b0a6e48e62dd4fa4898f82246150ef7cd5e246893d2c225c50ec4d4ac68
 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2
diff --git a/dev-libs/unibilium/unibilium-2.0.0.ebuild b/dev-libs/unibilium/unibilium-2.0.0.ebuild
deleted file mode 100644
index 22b6e120a8d1..000000000000
--- a/dev-libs/unibilium/unibilium-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+ MIT"
-SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND=""
-
-src_compile() {
-	append-flags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
-}
diff --git a/dev-libs/unibilium/unibilium-2.1.0.ebuild b/dev-libs/unibilium/unibilium-2.1.0.ebuild
deleted file mode 100644
index 38287f93cf52..000000000000
--- a/dev-libs/unibilium/unibilium-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/neovim/unibilium/"
-SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+ MIT"
-SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
-IUSE="static-libs"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-no-compress-man.patch"
-)
-
-src_compile() {
-	append-flags -fPIC
-	tc-export CC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
-}
diff --git a/dev-python/Faker/Faker-13.13.0.ebuild b/dev-python/Faker/Faker-13.13.0.ebuild
new file mode 100644
index 000000000000..d8e24e8d32e7
--- /dev/null
+++ b/dev-python/Faker/Faker-13.13.0.ebuild
@@ -0,0 +1,34 @@
+# 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..11} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 46a9f9c116c4..01f308c1ea81 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,4 @@
 DIST Faker-13.11.1.tar.gz 1501239 BLAKE2B 1ccf33e7a054d33921696ea917670fc0ff88c0b805700b32d9d4e5ed3b12d6e52ea164f762600315370eed06415e70923002b99f0c32fa9cd40cdeb437e338c0 SHA512 291517669143119099ac6bcc69a08091fb156728c465198079f764996849d8416ccaf169e1cf0d0dd02d99b2090494084dad7fdef9dfd2702411701bf71f54b5
 DIST Faker-13.12.0.tar.gz 1528234 BLAKE2B ca85e172d75f009802486fd5299581c0bd08f273f049df12b44159fb0c79d6b267579172da3c25f5aebaa0b897ea1e1067fe8e6a2527b0ccbf1e60de0257289c SHA512 9883e1a82b8d00ad83a31c71929ebb8f13e31bb34ada29772ab0bd8e9ac5e59ea44cf1a876e8c58a519814207fbc5ed950fdce7f7c259e5ca897e23662cd6511
 DIST Faker-13.12.1.tar.gz 1528407 BLAKE2B 2e4dd3c72c8531e523a4906c982d0652e6826b8e4b4af5400ec247070c79b2c07f2977bf40daf4be3166cb0e612945547f1a36489fdf5d072e7e5d0b0b4c1764 SHA512 75d9c30c1163ee6746c23870abdf11c32a07ca0f1e4d13aa71a28024ae897e352500c27c3c2709bd704d162a4352ec557a74ccf25fefbe9a5587541a5aea2f20
+DIST Faker-13.13.0.tar.gz 1528907 BLAKE2B be4593ba271330822f10590aa8e15c4658cd8a19333ab769d32178b72c15b504b8a5269443100250a863af25e40c582244e815cf612dbf8a57833f470ddeec09 SHA512 9e794bf95d40040dfa98439d0d9da19a90dd202905d4825c82453e202adad80bbea6da74ce0d36d8e205381d419a19b8b1fb60b32e20e97ee69b315f4f0c8eb9
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b1084b42f8a5..c8da9d1f8f8e 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
index db60cf6c457a..e0d71889aa44 100644
--- a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1 multiprocessing
 
@@ -67,6 +67,9 @@ src_prepare() {
 	# xfail_strict fails on py3.10
 	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
 
+	# which(1)...
+	sed -i -e 's:which:command -v:' Makefile || die
+
 	distutils-r1_src_prepare
 }
 
@@ -96,10 +99,25 @@ python_test() {
 		tests/test_client_session.py::test_client_session_timeout_zero
 	)
 
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# C extensions are not used on PyPy3
-		tests/test_http_parser.py::test_c_parser_loaded
-	)
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# C extensions are not used on PyPy3
+				tests/test_http_parser.py::test_c_parser_loaded
+			)
+			;;
+		python3.11)
+			EPYTEST_DESELECT+=(
+				# known problem with tests, not code itself
+				'tests/test_client_functional.py::test_timeout_on_reading_headers[pyloop]'
+				'tests/test_client_functional.py::test_timeout_on_conn_reading_headers[pyloop]'
+				'tests/test_client_request.py::test_data_stream_exc_chain[pyloop]'
+				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_with_loop
+				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_without_explicit_loop
+				tests/test_test_utils.py::TestAioHTTPTestCase::test_inner_example_without_explicit_loop
+			)
+			;;
+	esac
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
diff --git a/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild b/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
index 9494709fa4ed..5f993f60c834 100644
--- a/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
+++ b/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Helper to mock/fake web requests in Python's aiohttp package"
-HOMEPAGE="https://github.com/pnuckowski/aioresponses"
+HOMEPAGE="
+	https://github.com/pnuckowski/aioresponses/
+	https://pypi.org/project/aioresponses/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/autobahn/autobahn-22.5.1-r1.ebuild b/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
index b0aa9b524e50..1d5606fe61ec 100644
--- a/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
+++ b/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 820c1eb62ff6..8441ce125e43 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.24.3.gh.tar.gz 506694 BLAKE2B 5049ad69810c0fcb4d4133fae8efb7d5f44a5
 DIST boto3-1.24.4.gh.tar.gz 507020 BLAKE2B 2689aa84d0cc5a8c7978d18c480576015bb212a2714eb4edf3f9dd59e0be09da4a866e64fad1f3033cf02b807af7f827cceb56716bec5f04048c2eeb49b12804 SHA512 d23d1d7cb11d45d4419a5c4c1fcadacbfff8e8ebae69c8e522aa00e966048cd341bff8587e18bd0f043f1abd0558522aecede3aa83b84498df95c5a06068f15b
 DIST boto3-1.24.5.gh.tar.gz 508100 BLAKE2B 5ad9e6325a507ea94738eebee58200b4c4e967db5afb5a3076ad55b64df8637f961074377375d9bf4df233c1d53444738e82a868515d04dbd9632dad0889e2c0 SHA512 9387c70c54e05b1007135a896e69934d128a31735cdf0b61ccadd9412c7be5d53259c60a2b4410157037f9a95afaf8ef4f4a97d35e290ff12b7deb125a73d903
 DIST boto3-1.24.6.gh.tar.gz 508258 BLAKE2B 705b01006dfa63e386b39a0c4e791e0d9f2e4c5ae72bda3245843ba802556b1328214f80df788497d8b646882af816cfdba6d2769fe5bef82cbaf629fe9fcac6 SHA512 198df4e2f1e5f42bf0faa8baaea0bbc3d88fffda435afc3eccfdcc56940773dcdf43e8cb533a48265907bd118d8e969c7f9b37affb6508a8147ecee486017d92
+DIST boto3-1.24.7.gh.tar.gz 508670 BLAKE2B d526f6a4dc4c6126c61ca7c9074b4341c742f84a6e95b38cd8a450fb74df379cee44513e1be6bc7cd0c8f728598d0ecfc06240120a8da71f75f86371498f5233 SHA512 4d57e38c18138b950f93a234132ac1d31c9a29ad00ca5e1298517d6b16ff2849802ce6cfeb8de390c2eb25086043d45e0276a7a563707595649ca1905367be52
diff --git a/dev-python/boto3/boto3-1.24.7.ebuild b/dev-python/boto3/boto3-1.24.7.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.7.ebuild
@@ -0,0 +1,68 @@
+# 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 539e0dc071c7..30c9848b61c3 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.27.3.tar.gz 9078424 BLAKE2B 62414c2474ec44b3385c589793fd0c54984d
 DIST botocore-1.27.4.tar.gz 9079162 BLAKE2B 3707e0b53022185248d5c086860ddf99f6d43803414929252a6b090fbeb765606e1fa97896f6d9016e97a0a6b5388d754941f3a88645f5c1ea18f206d73127a7 SHA512 3743d79febcf33302de20b364267ae39a0887c7fa5e116a7209b1281b4985e593b5d3f0ea7bb6e608036d99d4df46931192f5a3a63c98f7b3da26a16ea6b5a3f
 DIST botocore-1.27.5.tar.gz 9110489 BLAKE2B 0cafef7d573de45613b3a03e94c7ddedc6fcf13bc450c5a7509748062d29e5ac2de96982a606cd7af007a2c01004bead3575e7150c4120964edb290d0002c9c9 SHA512 8fc4a81da092e3b3bfa5b347d6a03fc6b969aeecc7a13b0b5de75d96d8c826411cf82bd22e373d6a8b5a9da323468bf1fd9b036b2b72d1801c49056c5c991858
 DIST botocore-1.27.6.tar.gz 9109990 BLAKE2B ca3b1f4d14f4bbce87dcd989caf2fa79e475471c951ae13b2804e89f21a1dbf4949cbaba0abcf766f7a324f2b214135643b8d33f02a0866a06a5d81a1e50aa33 SHA512 a2e40d6b875b50bc8fe4180d8ad74a6f72c01f79d0130f9f4107436027fd0b40634359a5b9273bc9fd2eded16d14f40bd297467e57cc65707a495c312618d766
+DIST botocore-1.27.7.tar.gz 9102259 BLAKE2B 094ec463531f1dfd54ff32d0f44ebc39cdc0a6d4c3e19b49a25e25d9d13acdcd26c782c1d4819ea4f1cb8954a858aa6e997411785678700b7ca03cd8844527b5 SHA512 d4a1327f4314279548af00fbc6da2f9fc5f25f704da3f6ddfa90773878f28ac9f03556b00fa4c0207ec2e952eb716aa98c1c22abffbd51d82dc55d9e4ceeca5c
diff --git a/dev-python/botocore/botocore-1.27.7.ebuild b/dev-python/botocore/botocore-1.27.7.ebuild
new file mode 100644
index 000000000000..2fb86c59b25e
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.7.ebuild
@@ -0,0 +1,70 @@
+# 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 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/bottleneck/bottleneck-1.3.4.ebuild b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
index b065a6e175b4..c53291d5bbf6 100644
--- a/dev-python/bottleneck/bottleneck-1.3.4.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
+HOMEPAGE="
+	https://github.com/pydata/bottleneck/
+	https://pypi.org/project/Bottleneck/
+"
 SRC_URI="
 	https://github.com/pydata/bottleneck/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -23,9 +26,6 @@ RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 63a08521f487..7d91507c9379 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1 +1,2 @@
 DIST dogpile.cache-1.1.5.tar.gz 392536 BLAKE2B 062392cda9b06da889f924bc04743faa133b978a908ffdbc1e9cc9a2a9a69db22ee26b27c7cb2ec2dedee20786cf90c6d02d163731224956091b2d3baa25774b SHA512 b6d453121ef8e58da60478e2e1e2db57804dfa3b17cceeace930ba75d159629dfba4b5d63c50fbbc2eafeadbfcd6e1e4cbe22c8da1f54c90473f8ee677d764f8
+DIST dogpile.cache-1.1.6.tar.gz 393076 BLAKE2B 62c16ee7cc00608432d45fa7cb068300a4417a494e4580a2af5c3f7c5a0bf40a54e1b6f4924bbd7b40a0efc1cb9afb42f361811c257fa77eabcd64cc35fbcf51 SHA512 179246abf598675cdef988b463df4997c7eed8e7a110c22704052f905b65ad537b22ba28d7c96a28b2aa85b3e83ac42beb36843dc78ad503d41225ea1f9e7e77
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild
new file mode 100644
index 000000000000..cebd949d705e
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild
@@ -0,0 +1,30 @@
+# 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="A locking API for expiring values while a single thread generates a new value"
+HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 79af5bd7ee31..35daafa98f94 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,2 +1,2 @@
 DIST filesystem_spec-2022.3.0.tar.gz 331768 BLAKE2B 8f4e75f839419f7445a9291e3b67914338b0371742f1d3a556962b6e5abb31379cfeba52e0101f7660fd69569dabb49190820323b7e067a0c33c2184422ba067 SHA512 7c793b506e93f727bc4533a778f6108f82c9ab9274a8d259ecf483e0acbbfc97e3c8b07735f772f996867053d7e1f9c22687865f4f64cae6eb4fb511de2e9220
-DIST filesystem_spec-2022.5.0.tar.gz 337612 BLAKE2B 722ce370d0cfa97548956ea8bfc533ded3eadfb6a1fdfbb83513fad4fbfd34e2d700ae69ede812b7ba132beb29ab18914852487b94b2a8e5de4b106d6f554eca SHA512 9ea8040d5f94c3b0d3c21df7b27413e0a9a4f96973c961e3f88238adcf69a9c866790370c3d8b0149aa85d0bda67e72f7b75a2a9ff1c27e5171a4f0e41e3ffe9
+DIST filesystem_spec-2022.5.0.gh.tar.gz 337607 BLAKE2B 80f22e6c1ca0ec4194b41a85171d466792812c456129a05c286d8c46de950aeed4cd7a0ee01082e9dbfee5b89ca1a36441f961d7e61be816eb783cad8bca0979 SHA512 687dd0e7018e04d719f7c11e2238afe06f4e8d5eb7193e24dd000dbd79e5c52bed5fde919de47b0dab2d66e9ba93f28370a32f2458a6771e728b0ece68609504
diff --git a/dev-python/fsspec/fsspec-2022.5.0.ebuild b/dev-python/fsspec/fsspec-2022.5.0-r1.ebuild
similarity index 89%
rename from dev-python/fsspec/fsspec-2022.5.0.ebuild
rename to dev-python/fsspec/fsspec-2022.5.0-r1.ebuild
index d1a992aa38bb..dba46d7fc2e2 100644
--- a/dev-python/fsspec/fsspec-2022.5.0.ebuild
+++ b/dev-python/fsspec/fsspec-2022.5.0-r1.ebuild
@@ -4,17 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 MY_P=filesystem_spec-${PV}
 DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/"
+HOMEPAGE="
+	https://github.com/fsspec/filesystem_spec/
+	https://pypi.org/project/fsspec/
+"
 SRC_URI="
 	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
+		-> ${MY_P}.gh.tar.gz
+"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index ed6cf161d66a..3b1df987fc2b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,6 @@
 DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
 DIST hypothesis-hypothesis-python-6.47.0.gh.tar.gz 9313488 BLAKE2B 2b778d5d6d43f12ee57e05af2c0914ed8b5468235be331ee80624069d64ffe7cce299dd70d1777a4139d3d2590f64dca8b0fa515039dd43cc13bda3dacb5b76d SHA512 4502add489e2fbee8bcced0f7f65ea1015a40c7811133bc9b0979c2e46749c477bc29889e0be2be1bbb240afe96867160c2991b531591ea1e72fdf9d759da6f0
+DIST hypothesis-hypothesis-python-6.47.1.gh.tar.gz 9314265 BLAKE2B c2ad0120ab2cbd565f73d472f0a5a87e4b51ff9cf7c08d75dbc54223ad9fe60ed475577ca7dced64ab02d4cc1ee5d30525677c4acfe720af8251f804e72a3b00 SHA512 1aea9f949242d3a273584cd92e1829654d6ce385efcd631b412374f1f9252d3b759b8e216aaa9a49e26e0c3b12673348eac79d0189881f6a811f11daf14b0873
 DIST hypothesis-python-6.46.2.tar.gz 9305176 BLAKE2B 7d0abe4fc055eeb4660efbba9900b43209cc5ef1fd7b2362545e0d4145837cb7779cdf96c96cdd3770c1605ec8104818ece5cd012a90b164ab8ab63709d1c911 SHA512 207b4202aa36a28891c8051009ee6b8b6a8f0823840db7e4fc6840ebe6455060340f16f7e2e25bc5ad2adca1ff7fd8b58668ec2ca355b4579ec03aac616e786d
 DIST hypothesis-python-6.46.3.tar.gz 9306685 BLAKE2B a26c08361a7a58d8de8d8458a73c5c3c57f04dd2008ab31e604f0addc18fb7a52a7f4a98318498b398cd1ac5d2d718fd722c4d17e0b6ef326e0457355fda7482 SHA512 d55c3c4a57d18aa7f6d876123b09bcab32d508f5aa40048f2db7f0cab3948ebb6fab5f12d291ae4740cdd1c61c2d612c1ce804028bb59914efc132404224d1ee
 DIST hypothesis-python-6.46.7.tar.gz 9308855 BLAKE2B a26cd556bb56ff5a09987e7e4a9a46e966f26106376a4b5e481a933495f21c4a69dff0d68aa8d2006fc42794392eca35b4b68cb88e0d4695ecfe3bfe2098e9b6 SHA512 239343424df13db419bfc9057f9024ab8360cace07a0cf7d592744afa76fff54d5c30a0b7fecb41c642d034b2327feef7bec78840df25793727ce30be1aa7ef9
diff --git a/dev-python/hypothesis/hypothesis-6.47.1.ebuild b/dev-python/hypothesis/hypothesis-6.47.1.ebuild
new file mode 100644
index 000000000000..3c1dd06d14a6
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 1d0fd3b667d6..2026c6ac4285 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,4 +1,2 @@
 DIST jupyter_client-7.3.1.tar.gz 328697 BLAKE2B 9bdca39d974c21e1674f58a7aaa51a6b96e4dc307f918aacc403146827df5ad7a867243dd2df95e717ab7ebd62367817e4f43cae562f47147b4271d72240600e SHA512 86a98288f1be5321b8495d78770501ca45fe3139a482ec41606253eef69eaf4d3f284d1c373d9df64efe28428f32cd1a3b19842a7331b3ac200d780e7a786407
-DIST jupyter_client-7.3.2.tar.gz 328943 BLAKE2B 9093278ec2aeff9810bb0af86607185776d940e51ade5194c28800b1e08a1b40d4a020f947b4fac092e26e6a6b1b1eabe4b2c025d955f4ed1ddf3cd190dda96a SHA512 ec0ceb518eae63356058032b2e43979c78a691eefe594ef98767daff27ea88d4363bdc8f7c4e66c549fd5e7a5fdb0b538d58a45f7d73145093f7bbe26df03c71
-DIST jupyter_client-7.3.3.tar.gz 329130 BLAKE2B 7a60e8a0f4142198efc35f09378e3d35e3985b1531c3a759b7f3b4373c8df4dc76d56a28298f9f2972a4ba323e6d7a1b0c49d2dacdc490019da63692324d1ee1 SHA512 8a89f7e95f8f7f87ebc5ed362508cf5368c6e611c0291a56f72acafeb6ec85ad50e943133d178486605ad325dfc4e3b8231888b8dff0b0cc14b0e707b126f1d3
 DIST jupyter_client-7.3.4.tar.gz 329871 BLAKE2B 34f4cc01ced39e30f81e0c7524ada9319f7bea6fb0f941dad85ac3f969de71b68bde22359a9d343df84432e320994a8c4c4aa9ebd390b841e4b18042ac6f0b14 SHA512 3bb1fd7c93e16c03db0c249810fe48428dc9c1fa24ae885a3d30b4ac2d2e980f48edc06c2c6065b3e8f91610bf5bc7500854986f55c18bd9f695f192aa470beb
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.2.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.2.ebuild
deleted file mode 100644
index f5f42b66bafa..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# relax pyzmq dep
-	sed -i -e '/pyzmq/s:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.3.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.3.ebuild
deleted file mode 100644
index 943e7544dfac..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_client/
-	https://pypi.org/project/jupyter-client/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# relax pyzmq dep
-	sed -i -e '/pyzmq/s:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.14.2.ebuild b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
index 810e7efb1133..8f30b58a2c65 100644
--- a/dev-python/openapi-core/openapi-core-0.14.2.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
@@ -39,6 +39,7 @@ 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}]
 )"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 702d48ad2b0a..8e87b1c7e1e7 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1 +1,2 @@
 DIST python-phonenumbers-8.12.49.gh.tar.gz 4904202 BLAKE2B 20974162d5a8668c1d15021de71795983c4eda1f3afc931822b3593c80249481bcb4ea9f8b80066a71f7f2821284534991d3307eddea0e8f0270e75eced0573e SHA512 0504a84b3a6047c7ca4bc1667a0418d60c7f43052911751572820e7f4e40b430b8847e4c8f6e4d88dd7a2684b5ad8de2dfda8891d81fd8e1af1c595be152f9fc
+DIST python-phonenumbers-8.12.50.gh.tar.gz 4904755 BLAKE2B 60353aa081e4d4d0909302a97a45a89c1f94aac323a6a68fd93cd67146090189d0901b947c40e80e54e1718ce4a45c4a83d2799701ff1323666e82570174d358 SHA512 7a4406626d04a85e010036ceca20430a2562939ad8e7e2651afd65f0d5eb26feb1fbbe0c11f081ab58a9ab8bd81da2ccc153ad22f12eb8135b4f604077b5b29d
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild
new file mode 100644
index 000000000000..3b1d20a349fc
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index cdbf1b6f15c2..b7b0bff6abbd 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,3 +1,4 @@
 DIST plotly-5.2.2.tar.gz 7293292 BLAKE2B baef3accf8f5a3085908fcea558f8003687e18a1f97471c620c378c10d23d4222ef87dc47d64f45199b594414890db5b8ca5e3d7867c871d926c2ae441128c4a SHA512 4d6d79f7cc2063e73e7c17ff90a7d13324497ea8034d8ce62d79ec62b0530a59b2eaec8913fb05efb804cf5be8387b6f96d1710f41b9993233b5a13cf64dd310
 DIST plotly-5.7.0.tar.gz 8609793 BLAKE2B 12318f837c248c54fd3a8723bc772e8348186942565ba5a4c095f348dc338cc098318889900500ec333d7ec352801926ec91d312f2ccd98a89f804159223057f SHA512 01675470ef5218f06b4e9e485f23155a8e8550748fdf86afdb2a2969f838464b70d4452811427ab6bed2846093e8cfba7e891f7d0ea3a621e1fbffe22182d933
 DIST plotly-5.8.0.tar.gz 7573157 BLAKE2B 522d0d22d29d5ee204a9ecccbfe7862acee8b8605ab3dfce46a7b771020c24aff39b74aa3244c8384d61bb7e61ca5d2a610d061b0c208bf6cf9fe91543bbfc3f SHA512 2c17c97e897959a9826c19495c30cc7dd21de80e777c13927c1f47c3aa08f64f53ad715d156e78aabaf99fa2a8f85c90d63b08a227c5301710b5c561ee89429c
+DIST plotly-5.8.2.tar.gz 7574127 BLAKE2B 1a9d05009148a65b2f4206165a3e02ea7e130663e9658af64bddc0df6f1b720ca29e1cf30150634403b4bdda96156899f0e2e2d12b81cfd04a4bc9812057a79d SHA512 f262cbe20fa51861a319911e04446d4aa564b878dc1aa8e750a5d03af9747ec439fda941ab63d20ecb5374417174a2bd1c4f5549af5ba0f57f135d10ae0877a0
diff --git a/dev-python/plotly/plotly-5.8.2.ebuild b/dev-python/plotly/plotly-5.8.2.ebuild
new file mode 100644
index 000000000000..727c95cffca9
--- /dev/null
+++ b/dev-python/plotly/plotly-5.8.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plotly.com/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: package plotly-orca and kaleido
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/backports-tempfile[${PYTHON_USEDEP}]
+		' 3.8)
+		dev-python/inflect[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter[${PYTHON_USEDEP}]
+		dev-python/jupyterlab[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/pyshp[${PYTHON_USEDEP}]
+		sci-libs/scikit-image[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mkdir -p "${ED}"/etc/ || die
+	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
+	rmdir "${ED}"/usr/etc || die
+}
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 6eb87acfe17b..5a516a0fb762 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,3 +1,4 @@
 DIST pyghmi-1.5.42.tar.gz 241338 BLAKE2B f005697a13517f707bc74132d54ebdcc3752409aa147fdc9e99143f1c6a0507e24725e8bc2bc07980e017e6c6fff9868f84bf02fb598a2b580531aba0b66eafc SHA512 ec191a9862a4e6f28a8dbcb54759ad5c3a81ca3f85ecd4c9bbad634a3392296d5aad49d809a099d2719f2235dee2fac962374a4109dee120a4aba521a589afd5
 DIST pyghmi-1.5.43.tar.gz 241608 BLAKE2B edda01665ca4bf5337f8e92aea0fe099597f4c516a3f750ae9747cf80a0710ffc4324c387f826b440f03d30ef68efe93a99122abf9edd03727e32a5e255858f2 SHA512 53f6c4685b395cb3673be8e78c1845c2b0e021d526eb96b3c53a039c7de03e546c7cc6cc1d15003fd1d70ac9d9d2ddadadb62b6b4ee5a95d30c854582bf2785f
 DIST pyghmi-1.5.44.tar.gz 243496 BLAKE2B 9f6a0618c19ff523db33069f63353eb3c262bcce2dae1b8b94ed103997a6a7ec1bb68a43cabbc9dcbbd78182e193ed5d8ef24877e7d6e5f2cc7c53d2a48bc002 SHA512 7c526cdbee3f4ee0fab4001380b860203d5afeaf247709c13815f2de15dd733bbcf275bb0e3667d03bb15cec11711cd50dc8d56a8035bdeb4cb9c75f0f651a9a
+DIST pyghmi-1.5.45.tar.gz 243685 BLAKE2B cb84b9d5a2194a8be852870a967306abff226f065a8811636729f67b13bf5289268ce6e5130362998f047faee7efe3a577473f93acf800b5899de7d84569c10c SHA512 ed670ca2b7e6d21dd91198611a380dddb3a08073562c4e26a90805fb65eac0c410f217e8b3c91be21b0df399a77bb59ed5d87031ff74e89afa969462bfb5aeb7
diff --git a/dev-python/pyghmi/pyghmi-1.5.45.ebuild b/dev-python/pyghmi/pyghmi-1.5.45.ebuild
new file mode 100644
index 000000000000..1844c945d4be
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.45.ebuild
@@ -0,0 +1,39 @@
+# 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="A pure python implementation of IPMI protocol"
+HOMEPAGE="
+	https://opendev.org/x/pyghmi/
+	https://pypi.org/project/pyghmi/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
index 1ad54bae78d3..d009d00e3de7 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for aiohttp support"
-HOMEPAGE="https://github.com/aio-libs/pytest-aiohttp/"
+HOMEPAGE="
+	https://github.com/aio-libs/pytest-aiohttp/
+	https://pypi.org/project/pytest-aiohttp/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -26,3 +29,9 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning doesn't seem to be emitted for some reason
+	# doesn't look very important
+	tests/test_obsolete_fixtures.py::test_loop_fixture
+)
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 0268e06a7b06..562353b79c13 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-autodoc-typehints-1.18.1.gh.tar.gz 26424 BLAKE2B a30b966d26e89a7771404d4f9434038e4f201458bda439bf8fb3d2c2fc6dac0f12743622193edf45335d04148c96b6c3d51c2c7fe5437cb67b3b272ab19b2f18 SHA512 6c788949d1d3903ac589283e9188d5db3e0f173be1bb1a4740a88fc0383d7011fe60e57d25af74a2fc147b3c4d76c48770515bb8dbdf4ff18fb4bfb110a4a241
 DIST sphinx-autodoc-typehints-1.18.2.gh.tar.gz 26466 BLAKE2B d2e6e3135c5a60966338b2c8b143cab7c2a1b788abde0deb9cf3dc989ad31a1680ff07a9e3cb9bad500d053e7f0af2b5e099331bd92a2e01911333c6eb1589bf SHA512 5828cce6744a6a55e5dd25dc15b5bb6b28fcf430c5b65f8d610e24da426efe020e72af73ffee1f7929b3007fc76afc64f70c65d1f7e8db62b86ce52e2f836487
+DIST sphinx-autodoc-typehints-1.18.3.gh.tar.gz 26457 BLAKE2B 343a6ffcbca40f28a66c67266431f3a9b2292bd0d991de4287b9adf9e02b7d8fb24094646caa55790f32cd9081abca525f310367335d60fa1b7ea3bc9623bb1c SHA512 549bdfad8f5c07f5edb1c6cdeaff39df22cc7bfa475c70b5c54ff46b311d14c9f3682bf68663d852b95ebff8fd1b71038fc077495d99d870ae2efbf72ec99a42
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.3.ebuild
new file mode 100644
index 000000000000..9eca6f1f4db5
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.3.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..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.3.1-r1.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
similarity index 92%
rename from dev-python/spyder-kernels/spyder-kernels-2.3.1-r1.ebuild
rename to dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
index c4975118bc87..0745e08a1548 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.3.1-r1.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://pypi.org/project/spyder-kernels/
 "
 SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz
+	https://github.com/spyder-ide/spyder-kernels/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
@@ -28,8 +28,7 @@ RDEPEND="
 	>=dev-python/ipykernel-6.9.2[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
 	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.3.1[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-7.3.2[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.3.4[${PYTHON_USEDEP}]
 	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
 	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 8a10e642c248..547d51e841e4 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,2 +1,3 @@
 DIST watchdog-2.1.7.gh.tar.gz 100442 BLAKE2B 21247e1790077eb1eb2f1dc2bb8ddebc1b7f6a2c503238c52c660246fee8c1d3483119184a62114efb81c44665321d4e3aa18ffd73b3244a44c4c6df5204c834 SHA512 f69265aac6e8a840d230c15cfe88c803f043cb540785446113617c0fd1a3c5dce8a885a376bbadc75372a718800948dd4b00c618e18e033d510b8e2bc2bbb36b
 DIST watchdog-2.1.8.gh.tar.gz 101828 BLAKE2B ca14534af888154652951abb7e5f7f1bae1f2e072f113a034638f6384fc9b9044ab99191c6dc0ce38d7ded3dc6629a7aba1e1765f85ec5410706bd669411b929 SHA512 3182cb28701403e799c3850e5cd44acf6dc1aa7e98b1c4bb22b21de98fa4372c74a041e2f3be8d10ae77fe00018e460b98ce2fa5b0779edb84d15f952c407030
+DIST watchdog-2.1.9.gh.tar.gz 102882 BLAKE2B 601c94541846e0d63a39367040ac9b6a24c2920c70638ee3887a51838dd75bf8dfef8afae34c9566047c27502026d944f01c6f6249090f4a233a4892fc1e7c59 SHA512 1005c48b08968db7705acbb8a94a0852c72d8bcf45ac935e7e0b49daa6e422adb081cf431485618b37bcc1b2d3429369af1672b826bf9c1ebfa7aff91a88175a
diff --git a/dev-python/watchdog/watchdog-2.1.9.ebuild b/dev-python/watchdog/watchdog-2.1.9.ebuild
new file mode 100644
index 000000000000..0ea71e3c1a55
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.1.9.ebuild
@@ -0,0 +1,52 @@
+# 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} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="
+	https://github.com/gorakhargosh/watchdog/
+	https://pypi.org/project/watchdog/
+"
+SRC_URI="
+	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires root powers via sudo (yes, seriously)
+		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
+	)
+
+	epytest -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3e1c02437cc4..acdff51ddf8a 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/gh/gh-0.18.0-r1.ebuild b/dev-ruby/gh/gh-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..423a1e3699bf
--- /dev/null
+++ b/dev-ruby/gh/gh-0.18.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="gh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="multi-layer client for the github api v3"
+HOMEPAGE="https://github.com/travis-ci/gh"
+SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/webmock
+"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
+	>=dev-ruby/addressable-2.4.0:0
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
+	>dev-ruby/multi_json-1.0
+	dev-ruby/net-http-pipeline
+	>=dev-ruby/net-http-persistent-2.9:*
+"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/net-http-persistent/ s/~> 2.9/>= 2.9/' \
+		-e "/activesupport/ s/'~> 5.0'/'>= 5', '< 6.1'/" \
+		-e 's/git ls-files/find/' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index 212a737ee37f..4365b5553a51 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1,2 +1,3 @@
 DIST travis-1.10.0.gem 197632 BLAKE2B 0639f797789d1676f71b6354ed77e3e403865cca37e5e04c62e4cfd40d44e26e8e93ea0dbf39843811cccb7960e43b186d61d64f681d2eafe95de890d9fd66a7 SHA512 025e8cdf48100ff20d85925a6285993bda0d1651e145d554c2ec987c4557e2d3bc49da6529af4c577fcd9b88600549b3c12cff49b824d7fcb93a96a0c572603c
 DIST travis-1.11.0.gem 196096 BLAKE2B 2ea09d88fd45d6fd304746a96cc063c0525c8af8df6be2a0ba5c7ad06909055af23ea506f89f246f657c5a8920c429dd3aebc639f78cd1d0acb5bb03e4894434 SHA512 b6db17b149a54f7ab3c5b79439b1385386bbfe0350816d303e7c74c0494be08451fdb14550cba7fb54df3a643a530f1434bb1ee0c3e28c492ac6e8f3baf3d558
+DIST travis-1.11.1.gem 196096 BLAKE2B 22adbde1fb3407e5fdfd088552dd156e7162911266b363b017a5a32213e19d990b725884e5e268e2f30d22591c93d189a835b5f1fec17dd3610eb354d6008511 SHA512 7f639deba8edb34f1d03e1917901f6289f52e3e838315c74b416006fa478ad1f19a1b4511876feb0ab22c06ab203a525490463612292728c12fc9d5894a37ad4
diff --git a/dev-ruby/travis/travis-1.11.1.ebuild b/dev-ruby/travis/travis-1.11.1.ebuild
new file mode 100644
index 000000000000..11c5fa18fe0b
--- /dev/null
+++ b/dev-ruby/travis/travis-1.11.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Travis CI Client (CLI and Ruby library)"
+HOMEPAGE="https://github.com/travis-ci/travis.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+#RESTRICT="test"
+
+DEPEND+="test? ( dev-vcs/git )"
+RDEPEND+="dev-vcs/git"
+
+ruby_add_bdepend "
+	test? ( >dev-ruby/rack-test-0.6 dev-ruby/rspec-its )
+	>dev-ruby/sinatra-1.3
+"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
+	>=dev-ruby/gh-0.17
+	dev-ruby/highline:2
+	>=dev-ruby/json-2.3:2
+	>=dev-ruby/launchy-2.1
+	>dev-ruby/pusher-client-0.4
+"
+
+all_ruby_prepare() {
+	if use test ; then
+		git init --quiet . || die
+		git remote add origin "${HOMEPAGE}" || die
+		touch .travis.yml || die
+	fi
+
+	# Remove failing specs where $params keys are reset somewhere.
+	rm -f spec/cli/{cancel,restart}_spec.rb || die
+
+	sed -i -e 's/json_pure/json/' ../metadata || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp "assets/travis.sh" "travis"
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index db5868f0b09f..f56e676a1913 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 7f460cd88c2d..2cfad02c76a3 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,2 +1 @@
-DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
deleted file mode 100644
index 560fb85eb311..000000000000
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common toolchain-funcs
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
-	eapply_user
-	mv configure.{in,ac} || die
-	eautoreconf		  # prevent maintainer mode later on
-}
-
-src_compile() {
-	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
deleted file mode 100644
index 95facd63cb4f..000000000000
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common toolchain-funcs
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
-	eapply "${FILESDIR}/${PN}-15.6-darwin.patch"
-	eapply "${FILESDIR}/${PN}-15.8a-pkgconfig.patch"
-	eapply_user
-	mv configure.{in,ac} || die
-	eautoreconf		  # prevent maintainer mode later on
-}
-
-src_configure() {
-	econf --with-ncurses="${EPREFIX}"/usr
-}
-
-src_compile() {
-	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/files/cscope-15.6-darwin.patch b/dev-util/cscope/files/cscope-15.6-darwin.patch
deleted file mode 100644
index e755f3257efd..000000000000
--- a/dev-util/cscope/files/cscope-15.6-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/constants.h
-+++ b/src/constants.h
-@@ -103,7 +103,7 @@
- #define INCLUDES	8
- #define	FIELDS		9
- 
--#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__
-+#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ && !__MACH__
- # define TERMINFO	0	/* no terminfo curses */
- #else
- # define TERMINFO	1
diff --git a/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch b/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch
deleted file mode 100644
index 665b7169761e..000000000000
--- a/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -22,6 +22,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1,
-    [Define this if the scanner is run through lex, not flex])
- fi
- AC_PROG_YACC
-+PKG_PROG_PKG_CONFIG
- 
- dnl === BEGIN CURSES CHECK
- dnl Curses detection: Munged from Midnight Commander's configure.in
-@@ -363,7 +364,7 @@ dnl Check for a GNOME installation
- AC_DEFUN([AC_CHECK_GNOME],[
- 	has_gnome=false
- 	AC_CHECK_PROG(gnome1, gnome-config, true)	
--	AC_CHECK_PROG(gnome2, pkg-config, true)
-+	AC_CHECK_PROG(gnome2, $PKG_CONFIG, true)
- 
- 	if test x$gnome1 = xtrue; then
- 	  has_gnome=true
-@@ -373,7 +374,7 @@ AC_DEFUN([AC_CHECK_GNOME],[
- 	  has_gnome=true
- 	fi
- 	
--	AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0)
-+	AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0)
- 	AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true)
- 	AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux)
- ])
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index c971dd44d5c0..55fc994461a2 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1,2 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
-DIST ctags-20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
 DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
diff --git a/dev-util/ctags/ctags-20210321.0-r1.ebuild b/dev-util/ctags/ctags-20210321.0-r1.ebuild
deleted file mode 100644
index c63787072afc..000000000000
--- a/dev-util/ctags/ctags-20210321.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-if [[ ${PV} == *99999999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
-else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="json xml yaml"
-
-DEPEND="
-	json? ( dev-libs/jansson:= )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-ctags
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	#./misc/dist-test-cases > makefiles/test-cases.mak || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 1ce134dd90be..1dcc802091e2 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
deleted file mode 100644
index 1646a391c53c..000000000000
--- a/dev-vcs/git/files/50git-gentoo.el
+++ /dev/null
@@ -1,13 +0,0 @@
-
-;;; dev-vcs/git site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'git-status "git" "Entry point into git-status mode." t)
-;;(autoload 'git-blame-mode "git-blame"
-;;  "Minor mode for incremental blame for Git." t)
-
-;; GNU Emacs >=22.2 already includes vc-git.el.
-;; Enable the following only if Emacs has no GIT support.
-(unless (fboundp 'vc-git-registered)
-  (add-to-list 'load-path "@SITELISP@/compat")
-  (add-to-list 'vc-handled-backends 'GIT))
diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild
index c2d24bdf91ed..af947a55cb83 100644
--- a/dev-vcs/git/git-2.32.0-r1.ebuild
+++ b/dev-vcs/git/git-2.32.0-r1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -112,7 +112,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -307,10 +306,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -392,16 +387,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -449,7 +434,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -645,7 +630,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -658,7 +642,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild
index ab8a8a02552e..edf538fcc61a 100644
--- a/dev-vcs/git/git-2.33.1.ebuild
+++ b/dev-vcs/git/git-2.33.1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -112,7 +112,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -303,10 +302,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -388,16 +383,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -445,7 +430,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -641,7 +626,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -654,7 +638,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.34.1-r1.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild
index 075208f7ce0d..05833fea5ead 100644
--- a/dev-vcs/git/git-2.34.1-r1.ebuild
+++ b/dev-vcs/git/git-2.34.1-r1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -112,7 +112,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -303,10 +302,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -388,16 +383,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -445,7 +430,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -641,7 +626,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -654,7 +638,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.34.1.ebuild b/dev-vcs/git/git-2.34.1.ebuild
index 99934132cd97..1a7f759e52da 100644
--- a/dev-vcs/git/git-2.34.1.ebuild
+++ b/dev-vcs/git/git-2.34.1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -112,7 +112,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -303,10 +302,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -388,16 +383,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -445,7 +430,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -641,7 +626,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -654,7 +638,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.35.1.ebuild b/dev-vcs/git/git-2.35.1.ebuild
index cf75fd8cdeb0..f2fce14c4987 100644
--- a/dev-vcs/git/git-2.35.1.ebuild
+++ b/dev-vcs/git/git-2.35.1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.35.2.ebuild b/dev-vcs/git/git-2.35.2.ebuild
index 69ecee409630..3109246a25e0 100644
--- a/dev-vcs/git/git-2.35.2.ebuild
+++ b/dev-vcs/git/git-2.35.2.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -112,7 +112,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -303,10 +302,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -388,16 +383,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -445,7 +430,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -641,7 +626,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -654,7 +638,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.35.3.ebuild b/dev-vcs/git/git-2.35.3.ebuild
index 2193ea335c7a..cf66a5432c9c 100644
--- a/dev-vcs/git/git-2.35.3.ebuild
+++ b/dev-vcs/git/git-2.35.3.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.36.0.ebuild b/dev-vcs/git/git-2.36.0.ebuild
index 2193ea335c7a..cf66a5432c9c 100644
--- a/dev-vcs/git/git-2.36.0.ebuild
+++ b/dev-vcs/git/git-2.36.0.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.36.1.ebuild b/dev-vcs/git/git-2.36.1.ebuild
index 2193ea335c7a..cf66a5432c9c 100644
--- a/dev-vcs/git/git-2.36.1.ebuild
+++ b/dev-vcs/git/git-2.36.1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 2193ea335c7a..cf66a5432c9c 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 2193ea335c7a..cf66a5432c9c 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 2193ea335c7a..cf66a5432c9c 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 2193ea335c7a..cf66a5432c9c 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -51,7 +51,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -113,7 +113,6 @@ BDEPEND="
 		app-text/xmlto
 		sys-apps/texinfo
 	)
-	emacs? ( >=app-editors/emacs-23.1:* )
 	gnome-keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)
@@ -304,10 +303,6 @@ src_configure() {
 src_compile() {
 	git_emake || die "emake failed"
 
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
 	if use perl && use cgi ; then
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
@@ -389,16 +384,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@@ -446,7 +431,7 @@ src_install() {
 	# The following are excluded:
 	# completion - installed above
 	# diff-highlight - done above
-	# emacs - installed above
+	# emacs - removed upstream
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
@@ -642,7 +627,6 @@ showpkgdeps() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
 	elog "completion."
 	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
@@ -655,7 +639,3 @@ pkg_postinst() {
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 3819da70e269..104a784a865e 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild
index 850e45b239d1..a3c74d264fee 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/extremetuxracer/etr-${PV}.tar.xz -> ${
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 3c7173342a0c..dbe36e0f32ee 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 27a56bdfb7df..83c6b72154ce 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,2 +1,3 @@
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.54.3.tar.xz 28215048 BLAKE2B 3685b9c0eb923874e6829c365f437095b595ccea997b7b1411ab82117d09b84261241594959a049bd712fc0791d359c6bf536acfe022c44bcbd7804a2a59ef28 SHA512 153bb9d5b2e04ac87127663ab2cae1ae9e3c23666e54234efb3e247a6c3fdd67701f8baa31e06bba673c0cfc71202001c46fb8e0398770dfbc59e10f6de78077
+DIST librsvg-2.54.4.tar.xz 28214908 BLAKE2B 9aab1175494e50c9b4a1b74c76c0db4f052e42d98e48842c87a5434382983fc63f41923c67dc86c31988c114c4a18056d52a99c8ac2d5c1dd90af3da4814e4ac SHA512 e3415044a4faa48ec83e25cbd86dfbe7bc997286269298fb913a61a13d55195f660bcef459950979c2b8d60b144b29e33b278b2c4da0c376de65c34f39687e9a
diff --git a/gnome-base/librsvg/librsvg-2.54.4.ebuild b/gnome-base/librsvg/librsvg-2.54.4.ebuild
new file mode 100644
index 000000000000..817c28c4e00e
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.54.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
+
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}
+	>=virtual/rust-1.56[${MULTILIB_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	gtk-doc? ( dev-util/gi-docgen )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
+"
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
+
+QA_FLAGS_IGNORED="
+	usr/bin/rsvg-convert
+	usr/lib.*/librsvg.*
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-debug
+		$(multilib_native_use_enable gtk-doc)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# Set the rust target, which can differ from CHOST
+			RUST_TARGET="$(rust_abi)"
+			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+			cross_compiling=yes
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index edc114d8fa05..6748d733a370 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/dssi/dssi-1.1.1-r1.ebuild b/media-libs/dssi/dssi-1.1.1-r1.ebuild
index 686a3cb12271..8332b8f80e88 100644
--- a/media-libs/dssi/dssi-1.1.1-r1.ebuild
+++ b/media-libs/dssi/dssi-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,13 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-no-werror.patch
+)
+
 src_prepare() {
 	default
+
 	sed -i \
 		-e 's:libdir=.*:libdir=@libdir@:' \
 		dssi.pc.in || die
diff --git a/media-libs/dssi/files/dssi-1.1.1-no-werror.patch b/media-libs/dssi/files/dssi-1.1.1-no-werror.patch
new file mode 100644
index 000000000000..2ca32388a4ee
--- /dev/null
+++ b/media-libs/dssi/files/dssi-1.1.1-no-werror.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/775752
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -6,5 +6,5 @@ check_PROGRAMS = controller
+ 
+ controller_SOURCES = controller.c ../dssi/dssi.h
+ 
+-controller_CFLAGS = -Wall -Werror -I$(top_srcdir)/dssi $(ALSA_CFLAGS)
++controller_CFLAGS = -Wall -I$(top_srcdir)/dssi $(ALSA_CFLAGS)
+ 
diff --git a/media-libs/libpulse/libpulse-16.0.ebuild b/media-libs/libpulse/libpulse-16.0.ebuild
index a5de19e8c6f0..69c8802713cd 100644
--- a/media-libs/libpulse/libpulse-16.0.ebuild
+++ b/media-libs/libpulse/libpulse-16.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index 8131a7a919d6..42bc3556d5ac 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="debug doc examples"
 
 RDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9ab77a73a552..e414b8332794 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
index a54ff6c25597..bd4938358d89 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -379,4 +379,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_schemas_update
+	use udev && udev_reload
 }
diff --git a/media-sound/pulseaudio/pulseaudio-16.0.ebuild b/media-sound/pulseaudio/pulseaudio-16.0.ebuild
index 17140fce13c1..c68ea9e8181f 100644
--- a/media-sound/pulseaudio/pulseaudio-16.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-16.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 SRC_URI=""
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="metapackage"
 
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index cd77d11cbc5d..bd0c5b417abc 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1 +1,2 @@
 DIST strawberry-1.0.4.tar.xz 11208992 BLAKE2B f7a8b000672b55fb667fa4e0f32052adb138b4dbdf2149beec308555ed00417aac0734fe7ede1767bf648d5a10ab527b69f004ffe0b1f8834e65d6dbaf2c52a9 SHA512 e2a90911acd47735715266cb3745910a6e04a2ef4e98b0c9734230a5e2b382cf7d3681fc2e368a361e7a7c53bc0627a88a36e6df6c4f6941d54f65e2424d29ee
+DIST strawberry-1.0.5.tar.xz 11212028 BLAKE2B 2bb668bc9a4f66a9cdeaa28f47f21bf90f999d5524fa443bc7beaa1d0d7c6dc6727bf4df010fc06989e00fc34d62902add11186908fcf3f1b490c3bf745a9971 SHA512 4c625c75855f87952b274c85b4c5b021b27e75a74d46202ab3ea0aa3c86f510bccdece583483c4ba73e4733f151feb5eac5f5ef5d9a956995979fa307fd8d911
diff --git a/media-sound/strawberry/strawberry-1.0.5.ebuild b/media-sound/strawberry/strawberry-1.0.5.ebuild
new file mode 100644
index 000000000000..af868219fe69
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale xdg
+
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	>=media-libs/taglib-1.11.1_p20181028
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		>=media-libs/chromaprint-1.4:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qttest:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1b1025ca8bda..8a1c8d111732 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index d4d9107e320c..0da0881c4fee 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1 +1,2 @@
 DIST yle-dl-20220531.tar.gz 68985 BLAKE2B 66a011a741089aeb5a1247d9d4571341b0584b859831460c1ed39db8df0c0838e5271b5d5d9004f6c62134235cd881bc6a24752ef1a88ace95158b00803d5c13 SHA512 499929a8411c515259890fd228970718a357a19b221605cd882d9baa0c8ac688241a4cf8eeb2e75dbc26c28536579db1a5c0ae9db29fb4796b2ca1e093a8de36
+DIST yle-dl-20220610.tar.gz 69065 BLAKE2B 6b61351b23d1ea3f351a237bcf31aa9f542e15e621f88350f4758a97016631713b0a4e45c3878139e1040ab8dca671a91dff82c7f1c044de5493890ba0894d87 SHA512 87b8b5a63eb68f60a6b0de47c06ab3f6efd018767138f3da33fa51ecc4a8e56017fedfba20a190b451db3e862ce5a3abc7e9c7f485e9042e300913d47e8ed735
diff --git a/media-video/yle-dl/yle-dl-20220610.ebuild b/media-video/yle-dl/yle-dl-20220610.ebuild
new file mode 100644
index 000000000000..e2fb7c128ddc
--- /dev/null
+++ b/media-video/yle-dl/yle-dl-20220610.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download media files from Yle Areena"
+HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
+SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Requires an active internet connection during tests,
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="media-video/ffmpeg
+	net-misc/wget
+	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/progress[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+		${RDEPEND}
+		media-video/ffmpeg[gnutls]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	elog "Sample configuration file has been installed to "
+	elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
+	elog
+	optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 4196c2324522..15a9a14b86ca 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 20338ccbf799..fb34aed435a8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Jun 2022 18:09:31 +0000
+Sat, 11 Jun 2022 08:39:31 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 20338ccbf799..fb34aed435a8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Jun 2022 18:09:31 +0000
+Sat, 11 Jun 2022 08:39:31 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a26c3d9432c7..e1bc386c1813 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 1443541057a5..932071934847 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/espeak-ng-1.51 b/metadata/md5-cache/app-accessibility/espeak-ng-1.51
index c1592d577324..90b800afb067 100644
--- a/metadata/md5-cache/app-accessibility/espeak-ng-1.51
+++ b/metadata/md5-cache/app-accessibility/espeak-ng-1.51
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/espeak-ng/espeak-ng
 INHERIT=autotools
 IUSE=+async +klatt l10n_ru l10n_zh man mbrola +sound
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86
 LICENSE=GPL-3+ unicode
 RDEPEND=!app-accessibility/espeak mbrola? ( app-accessibility/mbrola ) sound? ( media-libs/pcaudiolib ) sound? ( media-sound/sox )
 SLOT=0
 SRC_URI=https://github.com/espeak-ng/espeak-ng/archive/1.51.tar.gz -> espeak-ng-1.51.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8d12c4f6ec6199d0bc7d7a5e49cda387
+_md5_=b91f6d2e728b023fb35a961830a1e2a4
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a7ee24b3bb52..cd1315006e75 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.7 b/metadata/md5-cache/app-admin/awscli-1.25.7
new file mode 100644
index 000000000000..c32cf37d4d69
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.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=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/aws/aws-cli/archive/1.25.7.tar.gz -> aws-cli-1.25.7.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a47ec3f6b9c6b798cadd95af86a98247
diff --git a/metadata/md5-cache/app-admin/terraform-1.1.7 b/metadata/md5-cache/app-admin/terraform-1.1.7
index 9cb5f79445d5..680a9df676fb 100644
--- a/metadata/md5-cache/app-admin/terraform-1.1.7
+++ b/metadata/md5-cache/app-admin/terraform-1.1.7
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=A tool for building, changing, and combining infrastructure safely
 EAPI=8
 HOMEPAGE=https://www.terraform.io/
-KEYWORDS=~amd64
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/hashicorp/terraform/archive/v1.1.7.tar.gz -> terraform-1.1.7.tar.gz https://dev.gentoo.org/~williamh/dist/terraform-1.1.7-deps.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d7a11c2797b342f7c767dbb8b0f8ffd9
+_md5_=5d6a86bed4bcc3b6624ef66f14f836c6
diff --git a/metadata/md5-cache/app-admin/vault-1.10.4 b/metadata/md5-cache/app-admin/vault-1.10.4
new file mode 100644
index 000000000000..be17115253ea
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.10.4
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+INHERIT=fcaps go-module systemd
+IUSE=+webui +filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/zmedico/vault/archive/refs/tags/v1.10.4-vendor.tar.gz -> vault-1.10.4-vendor.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.10.4-webui.tar.xz )
+_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2a2e5d699ec1caa07f36b450a52190bf
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b222b59ac71f..e7d4ff31808b 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.44 b/metadata/md5-cache/app-crypt/monkeysphere-0.44
index 4069eba4bf26..bf8b23f8e444 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.44
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.44
@@ -3,10 +3,12 @@ DEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0
 DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
 EAPI=7
 HOMEPAGE=http://web.monkeysphere.info/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0= net-misc/openssh
 RESTRICT=test
-SLOT=0/0
+SLOT=0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz
-_md5_=8e4a1204861fbe475350f2e08d2f559a
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=45a599dd78660c5766135cb2f0253498
diff --git a/metadata/md5-cache/app-crypt/sbsigntools-0.9.4 b/metadata/md5-cache/app-crypt/sbsigntools-0.9.4
index 3e5274a0dd3e..eec1bd555d58 100644
--- a/metadata/md5-cache/app-crypt/sbsigntools-0.9.4
+++ b/metadata/md5-cache/app-crypt/sbsigntools-0.9.4
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl:0= sys-apps/util-linux
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/snapshot/sbsigntools-0.9.4.tar.gz https://dev.gentoo.org/~tamiko/distfiles/sbsigntool-0.8-ccan.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=00aee1c18f82d3f3bdafb36051f5cdc2
+_md5_=b266103e294d8b7aff710b015b2e3443
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index c01ccefaaeeb..0d5f62f99036 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/neovim-0.5.1 b/metadata/md5-cache/app-editors/neovim-0.5.1
deleted file mode 100644
index ff55651240fe..000000000000
--- a/metadata/md5-cache/app-editors/neovim-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-util/gperf virtual/libiconv virtual/libintl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Vim-fork focused on extensibility and agility
-EAPI=7
-HOMEPAGE=https://neovim.io
-INHERIT=cmake lua-single optfeature xdg
-IUSE=+lto +nvimpager +tui lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
-LICENSE=Apache-2.0 vim
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
-SLOT=0
-SRC_URI=https://github.com/neovim/neovim/archive/v0.5.1.tar.gz -> neovim-0.5.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=333e915430e5ceb9116bf4569884d16f
diff --git a/metadata/md5-cache/app-editors/neovim-0.6.0 b/metadata/md5-cache/app-editors/neovim-0.6.0
deleted file mode 100644
index bf483b472c56..000000000000
--- a/metadata/md5-cache/app-editors/neovim-0.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Vim-fork focused on extensibility and agility
-EAPI=7
-HOMEPAGE=https://neovim.io
-INHERIT=cmake lua-single optfeature xdg
-IUSE=+lto +nvimpager test +tui lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
-LICENSE=Apache-2.0 vim
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
-REQUIRED_USE=test? ( lua_single_target_luajit )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://github.com/neovim/neovim/archive/v0.6.0.tar.gz -> neovim-0.6.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c2f236394b0120d94b7bd035d1ab37d4
diff --git a/metadata/md5-cache/app-editors/neovim-0.6.1-r1 b/metadata/md5-cache/app-editors/neovim-0.6.1-r1
deleted file mode 100644
index 80d081cbc358..000000000000
--- a/metadata/md5-cache/app-editors/neovim-0.6.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.42.0[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.42.0:= >=dev-libs/libvterm-0.1.4 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.1:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Vim-fork focused on extensibility and agility
-EAPI=7
-HOMEPAGE=https://neovim.io
-INHERIT=cmake lua-single optfeature xdg
-IUSE=+lto +nvimpager test +tui lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
-LICENSE=Apache-2.0 vim
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.42.0[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.42.0:= >=dev-libs/libvterm-0.1.4 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.1:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
-REQUIRED_USE=test? ( lua_single_target_luajit )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://github.com/neovim/neovim/archive/v0.6.1.tar.gz -> neovim-0.6.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d0ae0f0af009f9672aed93bbfc41c9e
diff --git a/metadata/md5-cache/app-editors/vile-9.8u-r2 b/metadata/md5-cache/app-editors/vile-9.8u-r2
deleted file mode 100644
index 9ac4a78f0433..000000000000
--- a/metadata/md5-cache/app-editors/vile-9.8u-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=app-eselect/eselect-vi >=sys-libs/ncurses-5.2:0= virtual/libcrypt:= iconv? ( virtual/libiconv ) perl? ( dev-lang/perl:= )
-DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
-EAPI=7
-HOMEPAGE=https://invisible-island.net/vile/
-IUSE=perl iconv
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-vi >=sys-libs/ncurses-5.2:0= virtual/libcrypt:= iconv? ( virtual/libiconv ) perl? ( dev-lang/perl:= )
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/vile/current/vile-9.8u.tgz
-_md5_=45cefaa9233c60aca417b542052f89e3
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index d22a6c92a3ce..d87ba6c68a93 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/eldev-1.1.2 b/metadata/md5-cache/app-emacs/eldev-1.1.2
new file mode 100644
index 000000000000..8f83238c178b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/eldev-1.1.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.4:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Emacs Lisp Development Tool
+EAPI=8
+HOMEPAGE=https://github.com/doublep/eldev/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-24.4:*
+SLOT=0
+SRC_URI=https://github.com/doublep/eldev/archive/1.1.2.tar.gz -> eldev-1.1.2.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=248b21ab3868a0f8d85d2cea4d8cc553
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index bf2dccb05ceb..e912e30a6c82 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/cloud-init-22.2-r1 b/metadata/md5-cache/app-emulation/cloud-init-22.2-r1
index f7af7fe75d81..d7337d2e2749 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-22.2-r1
+++ b/metadata/md5-cache/app-emulation/cloud-init-22.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/22.2/+download/cloud-init-22.2.tar.gz
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=b63fd0d9d95d3e6448da3e1c8b84c40e
+_md5_=e18924ef65cfa5c461658d699d89067a
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index ce5a74c0ca99..ba56b5ffa457 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=b6810e418dba03beb2e9fb1914343d44
+_md5_=20e5d785f9bbd64675656cd57ca79c29
diff --git a/metadata/md5-cache/app-emulation/free42-3.0.11a b/metadata/md5-cache/app-emulation/free42-3.0.11a
new file mode 100644
index 000000000000..32cd7226dc1b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/free42-3.0.11a
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An HP-42S Calculator Simulator
+EAPI=8
+HOMEPAGE=https://thomasokken.com/free42/
+INHERIT=toolchain-funcs
+IUSE=+alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
+SLOT=0
+SRC_URI=https://thomasokken.com/free42/upstream/free42-nologo-3.0.11a.tgz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9cdd65bee9c1efade8156b69d9613e5d
diff --git a/metadata/md5-cache/app-emulation/plus42-1.0.6 b/metadata/md5-cache/app-emulation/plus42-1.0.6
new file mode 100644
index 000000000000..e65530df2f17
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/plus42-1.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An Enhanced HP-42S Calculator Simulator
+EAPI=8
+HOMEPAGE=https://thomasokken.com/plus42/
+INHERIT=toolchain-funcs
+IUSE=+alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
+SLOT=0
+SRC_URI=https://thomasokken.com/plus42/upstream/plus42-upstream-1.0.6.tgz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=fb10f765bcac0795e75bcfe5959534d0
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 320e8cc7440d..f03f3ace9143 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-1.40.0 b/metadata/md5-cache/app-metrics/redis_exporter-1.40.0
new file mode 100644
index 000000000000..a3d05b7b1352
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/redis_exporter-1.40.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=acct-user/redis_exporter acct-group/redis_exporter
+DESCRIPTION=Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x
+EAPI=7
+HOMEPAGE=https://github.com/oliver006/redis_exporter
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD
+RDEPEND=acct-user/redis_exporter acct-group/redis_exporter
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/oliver006/redis_exporter/archive/v1.40.0.tar.gz -> redis_exporter-1.40.0.tar.gz https://dev.gentoo.org/~zmedico/dist/redis_exporter-1.38.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f0eb7046bac2288514a3d9db2efe2e70
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 276036854cf3..da407e684867 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/ddcutil-1.2.2 b/metadata/md5-cache/app-misc/ddcutil-1.2.2
index 1340e96e2042..065f75c20cf1 100644
--- a/metadata/md5-cache/app-misc/ddcutil-1.2.2
+++ b/metadata/md5-cache/app-misc/ddcutil-1.2.2
@@ -13,4 +13,4 @@ REQUIRED_USE=drm? ( X )
 SLOT=0/4
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v1.2.2.tar.gz -> ddcutil-1.2.2.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=394c7032f5e8f4d44f9e15ddbf39d01c
+_md5_=58bf8c8d136a82b0abf4075cde5b3978
diff --git a/metadata/md5-cache/app-misc/vifm-0.11 b/metadata/md5-cache/app-misc/vifm-0.11
index dfae8b6a0ea7..31c7aeb3eec7 100644
--- a/metadata/md5-cache/app-misc/vifm-0.11
+++ b/metadata/md5-cache/app-misc/vifm-0.11
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk
 SLOT=0
 SRC_URI=https://github.com/vifm/vifm/archive/v0.11.tar.gz -> vifm-0.11.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=01c43791b488f179cd72dad96570cbeb
+_md5_=bc67fbe9ba162a7672a12390ba51a81d
diff --git a/metadata/md5-cache/app-misc/vifm-0.12 b/metadata/md5-cache/app-misc/vifm-0.12
index ba6599bfd064..22963cc61612 100644
--- a/metadata/md5-cache/app-misc/vifm-0.12
+++ b/metadata/md5-cache/app-misc/vifm-0.12
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk
 SLOT=0
 SRC_URI=https://github.com/vifm/vifm/archive/v0.12.tar.gz -> vifm-0.12.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b61d050888d2abef41d6c0f418d9f1a8
+_md5_=581f3e75025baaf099e9435e11abe001
diff --git a/metadata/md5-cache/app-misc/vifm-9999 b/metadata/md5-cache/app-misc/vifm-9999
index 2182bef9d2e5..ae75a01c7e6f 100644
--- a/metadata/md5-cache/app-misc/vifm-9999
+++ b/metadata/md5-cache/app-misc/vifm-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a48fb846738941a9c50f0272436a6cef
+_md5_=d146ff2ca307e2af716010b11f4697a4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e70954cb6f5e..e4a06bed376f 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-7.3.4.2 b/metadata/md5-cache/app-office/libreoffice-7.3.4.2
index e181c790c155..27e7f536dc98 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.3.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.3.4.2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.3.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.4//libreoffice-7.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.4//libreoffice-help-7.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.4.2/src/libreoffice-7.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.4.2/src/libreoffice-help-7.3.4.2.tar.xz https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b8c8f54743df0bffb0b8fea17562a19d
+_md5_=138042c5fea5aea452609a7b5542b131
diff --git a/metadata/md5-cache/app-office/libreoffice-7.3.9999 b/metadata/md5-cache/app-office/libreoffice-7.3.9999
index 0402364e5f53..cb1e35dccc92 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.3.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.3.9999
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=57b622fb2efcc5308f7f8ccec610e1aa
+_md5_=cfac42616f47bd7e6569153b9eb32ef6
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 74e9f5e4fe2f..51dfe2417421 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b436e522748ca6549fcf62a4c7840cc9
+_md5_=b4e422012100d71ee260ae5b09669338
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 6b2b1df89dbb..dc4d123ec05a 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/bash-support-4.2.1 b/metadata/md5-cache/app-vim/bash-support-4.2.1
deleted file mode 100644
index da34cc3cd031..000000000000
--- a/metadata/md5-cache/app-vim/bash-support-4.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: write and run bash scripts using menus and hotkeys
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=365
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/bash-support-4.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bash-support-4.2.1.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=c974833191f877d2a586479a5ec02a41
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.18 b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
deleted file mode 100644
index af7a19487e4a..000000000000
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easily browse vim buffers
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.18.tar.gz -> bufexplorer-7.4.18.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=f331a1983899a0e4aba9b501e7c6ffc4
diff --git a/metadata/md5-cache/app-vim/csound-syntax-0.8.1 b/metadata/md5-cache/app-vim/csound-syntax-0.8.1
deleted file mode 100644
index fc5b46376cf5..000000000000
--- a/metadata/md5-cache/app-vim/csound-syntax-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: set of tools for editing Csound files with vim
-EAPI=7
-HOMEPAGE=https://github.com/luisjure/csound
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/luisjure/csound-vim/archive/v0.8.1.tar.gz -> csound-syntax-0.8.1.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=afed93cb5d7b4ff5fc6fe3786e16cb2b
diff --git a/metadata/md5-cache/app-vim/ctrlp-1.80 b/metadata/md5-cache/app-vim/ctrlp-1.80
deleted file mode 100644
index ab46cae42663..000000000000
--- a/metadata/md5-cache/app-vim/ctrlp-1.80
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support
-EAPI=6
-HOMEPAGE=https://github.com/ctrlpvim/ctrlp.vim
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/1.80.tar.gz -> ctrlp-1.80.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=944019784167acad3e18b68aab6bec1a
diff --git a/metadata/md5-cache/app-vim/diffchar-8.2 b/metadata/md5-cache/app-vim/diffchar-8.2
deleted file mode 100644
index 7d3d89a11469..000000000000
--- a/metadata/md5-cache/app-vim/diffchar-8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
-EAPI=6
-HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
-INHERIT=vim-plugin vcs-snapshot
-KEYWORDS=amd64 x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/rickhowe/diffchar.vim/archive/837334b268302cf6c597d88485aa8aad6a500b98.tar.gz -> diffchar-8.2.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=efa0af6f5367c544ae3f7acd4cc6f8d0
diff --git a/metadata/md5-cache/app-vim/ferret-4.0 b/metadata/md5-cache/app-vim/ferret-4.0
deleted file mode 100644
index b7add8fed188..000000000000
--- a/metadata/md5-cache/app-vim/ferret-4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/4.0.tar.gz -> ferret-4.0.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=41e62ff7c9f7b9e49f06744c2cbcf439
diff --git a/metadata/md5-cache/app-vim/frawor-0.2.3 b/metadata/md5-cache/app-vim/frawor-0.2.3
deleted file mode 100644
index ebdf41a1e47c..000000000000
--- a/metadata/md5-cache/app-vim/frawor-0.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: modular vim framework
-EAPI=6
-HOMEPAGE=https://bitbucket.org/ZyX_I/frawor
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/ZyX_I/frawor/downloads/frawor-0.2.3.tar.xz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=1d2114f744e2834704b4d45e137bbfcd
diff --git a/metadata/md5-cache/app-vim/fugitive-2.4 b/metadata/md5-cache/app-vim/fugitive-2.4
deleted file mode 100644
index c5f820f01f1f..000000000000
--- a/metadata/md5-cache/app-vim/fugitive-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-INHERIT=vim-plugin vcs-snapshot
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.4.tar.gz -> fugitive-2.4.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=aea2817ab56aa2f5478b512532f282a7
diff --git a/metadata/md5-cache/app-vim/fugitive-2.5 b/metadata/md5-cache/app-vim/fugitive-2.5
deleted file mode 100644
index 48dbb9ee4e69..000000000000
--- a/metadata/md5-cache/app-vim/fugitive-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.5.tar.gz -> fugitive-2.5.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=42a25b5dd48e6b7d272d3b8c87693796
diff --git a/metadata/md5-cache/app-vim/fugitive-3.1 b/metadata/md5-cache/app-vim/fugitive-3.1
deleted file mode 100644
index 342b3636b6f6..000000000000
--- a/metadata/md5-cache/app-vim/fugitive-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.1.tar.gz -> fugitive-3.1.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/fugitive-3.2 b/metadata/md5-cache/app-vim/fugitive-3.2
deleted file mode 100644
index f177e9170302..000000000000
--- a/metadata/md5-cache/app-vim/fugitive-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.2.tar.gz -> fugitive-3.2.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180316 b/metadata/md5-cache/app-vim/gitgutter-20180316
deleted file mode 100644
index b624989f6b6e..000000000000
--- a/metadata/md5-cache/app-vim/gitgutter-20180316
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
-EAPI=6
-HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-INHERIT=vim-plugin vcs-snapshot
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/airblade/vim-gitgutter/archive/37bdd03d176c5e182c7e8dbdc79c3f71d2a04898.tar.gz -> gitgutter-20180316.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=31986e7af553048cab18529866d849e3
diff --git a/metadata/md5-cache/app-vim/gitlog-5.1.0 b/metadata/md5-cache/app-vim/gitlog-5.1.0
deleted file mode 100644
index c5011afda80f..000000000000
--- a/metadata/md5-cache/app-vim/gitlog-5.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: git log and diff plugin for vim
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=Artistic
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_5.1.0.tar.gz -> gitlog-5.1.0.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=cc3771a210a332a3a19f4fad35e9c445
diff --git a/metadata/md5-cache/app-vim/gitolite-syntax-20111225 b/metadata/md5-cache/app-vim/gitolite-syntax-20111225
deleted file mode 100644
index ca8eebc39f4d..000000000000
--- a/metadata/md5-cache/app-vim/gitolite-syntax-20111225
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: gitolite syntax highlighting
-EAPI=7
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2900
-INHERIT=vim-plugin
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-syntax-20111225.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=4770a61cd80cc1f941127243924ef64a
diff --git a/metadata/md5-cache/app-vim/gnupg-2.6 b/metadata/md5-cache/app-vim/gnupg-2.6
deleted file mode 100644
index 098785ba68b8..000000000000
--- a/metadata/md5-cache/app-vim/gnupg-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=transparent editing of gpg encrypted files
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3645
-INHERIT=vim-plugin
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gnupg-2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gnupg-2.6.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=fc9929901bdc803cfdb788e382dfa053
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1 b/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
deleted file mode 100644
index 8026db2e5966..000000000000
--- a/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
-EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
-LICENSE=bufexplorer.vim
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/lustyexplorer-4.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.3.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=07f9a6f76dfb828f91bcff1ff23fb21a
diff --git a/metadata/md5-cache/app-vim/merginal-2.1.0 b/metadata/md5-cache/app-vim/merginal-2.1.0
deleted file mode 100644
index 2bfadb54ebe4..000000000000
--- a/metadata/md5-cache/app-vim/merginal-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim script: fugitive extension to manage and merge git branches
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.1.0.tar.gz -> merginal-2.1.0.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=c7c8e93377f9d5242523f5846b13c43f
diff --git a/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1 b/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
deleted file mode 100644
index 0f05e22d93c1..000000000000
--- a/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/scrooloose/nerdtree/archive/5.0.0.tar.gz -> nerdtree-5.0.0.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=a9f316d53ff944b35e66d1b4070bf50e
diff --git a/metadata/md5-cache/app-vim/nerdtree-6.4.1 b/metadata/md5-cache/app-vim/nerdtree-6.4.1
deleted file mode 100644
index 09f9b8d40a50..000000000000
--- a/metadata/md5-cache/app-vim/nerdtree-6.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/scrooloose/nerdtree/archive/6.4.1.tar.gz -> nerdtree-6.4.1.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=a9acd7afd7efbead48b45a47104dc54c
diff --git a/metadata/md5-cache/app-vim/perl-support-5.3.2 b/metadata/md5-cache/app-vim/perl-support-5.3.2
deleted file mode 100644
index e3467d72ddbf..000000000000
--- a/metadata/md5-cache/app-vim/perl-support-5.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=556
-INHERIT=vim-plugin
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-2+
-RDEPEND=dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-support-5.3.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/perl-support-5.3.2.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=c8566da4b7bfe69c15e96f3105dffce8
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r3 b/metadata/md5-cache/app-vim/splice-1.1.0-r3
deleted file mode 100644
index fb26a197af0e..000000000000
--- a/metadata/md5-cache/app-vim/splice-1.1.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: resolve conflicts during three-way merges
-EAPI=7
-HOMEPAGE=https://docs.stevelosh.com/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026
-INHERIT=vim-plugin python-single-r1 vcs-snapshot
-IUSE=+python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( app-editors/vim[python,python_single_target_python3_8(-)?] app-editors/gvim[python,python_single_target_python3_8(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=f4e0fb96a321e45d9f4421a06cd17835
diff --git a/metadata/md5-cache/app-vim/tlib-1.22 b/metadata/md5-cache/app-vim/tlib-1.22
deleted file mode 100644
index 5207221d0941..000000000000
--- a/metadata/md5-cache/app-vim/tlib-1.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a library of utility functions
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.22.tar.gz -> tlib-1.22.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=df8d9cb0b1beff63c2ffd90ee9e9af35
diff --git a/metadata/md5-cache/app-vim/tlib-1.23 b/metadata/md5-cache/app-vim/tlib-1.23
deleted file mode 100644
index 162188dc72d9..000000000000
--- a/metadata/md5-cache/app-vim/tlib-1.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a library of utility functions
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.23.tar.gz -> tlib-1.23.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=ccd42aea14a8f90bf3d6af65da272389
diff --git a/metadata/md5-cache/app-vim/txtfmt-2.4-r1 b/metadata/md5-cache/app-vim/txtfmt-2.4-r1
deleted file mode 100644
index 96c9047dcdb4..000000000000
--- a/metadata/md5-cache/app-vim/txtfmt-2.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: rich text highlighting in vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2208
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13856 -> txtfmt-2.4.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=cf6c5f72b305054937cc106660ccedd8
diff --git a/metadata/md5-cache/app-vim/unite-4.0-r1 b/metadata/md5-cache/app-vim/unite-4.0-r1
deleted file mode 100644
index 3fe878daf16a..000000000000
--- a/metadata/md5-cache/app-vim/unite-4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: unite all sources
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3396
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/unite-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.0.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=a46e7cbb546406b4d6a2beeb982174f2
diff --git a/metadata/md5-cache/app-vim/vim-go-1.13 b/metadata/md5-cache/app-vim/vim-go-1.13
deleted file mode 100644
index 79871908328a..000000000000
--- a/metadata/md5-cache/app-vim/vim-go-1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Go development plugin for Vim
-EAPI=6
-HOMEPAGE=https://github.com/fatih/vim-go
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/fatih/vim-go/archive/v1.13.tar.gz -> vim-go-1.13.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=c0a15036e78a3b6e6e88e353af351fff
diff --git a/metadata/md5-cache/app-vim/vim-go-1.19 b/metadata/md5-cache/app-vim/vim-go-1.19
deleted file mode 100644
index a2b333ba2fe0..000000000000
--- a/metadata/md5-cache/app-vim/vim-go-1.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Go development plugin for Vim
-EAPI=6
-HOMEPAGE=https://github.com/fatih/vim-go
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/fatih/vim-go/archive/v1.19.tar.gz -> vim-go-1.19.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=3650bfe3902e2bbf050f9c5a37d1e2b2
diff --git a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224 b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
deleted file mode 100644
index 0cc29cbf1c96..000000000000
--- a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: nftables syntax and indent
-EAPI=7
-HOMEPAGE=https://github.com/nfnty/vim-nftables
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/nfnty/vim-nftables/archive/01c7b97eff12fd4b624e6efa2c0468163db61ebc.tar.gz -> vim-nftables-0_pre20200224.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=1418fafebe897c138955eaebf9388d29
diff --git a/metadata/md5-cache/app-vim/vimcdoc-1.9.0 b/metadata/md5-cache/app-vim/vimcdoc-1.9.0
deleted file mode 100644
index acdb1fcb0c1d..000000000000
--- a/metadata/md5-cache/app-vim/vimcdoc-1.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=online vim documentation translated into Chinese
-EAPI=6
-HOMEPAGE=http://vimcdoc.sourceforge.net/
-INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-1.9.0.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=cb77845350d433bf01c2fa789c0569bb
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
deleted file mode 100644
index 31c02d155cc7..000000000000
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy and fast outlining
-EAPI=6
-HOMEPAGE=https://github.com/vimoutliner/vimoutliner
-INHERIT=vim-plugin
-KEYWORDS=amd64 ~ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.tar.gz -> vimoutliner-0.3.6.tar.gz
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=e545d2de961d48ea32d144903b385057
diff --git a/metadata/md5-cache/app-vim/yankring-19.0 b/metadata/md5-cache/app-vim/yankring-19.0
deleted file mode 100644
index 792a35aa3a4a..000000000000
--- a/metadata/md5-cache/app-vim/yankring-19.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: maintains a history of previous yanks and deletes
-EAPI=7
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1234
-INHERIT=vim-plugin
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/yankring-19.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/yankring-19.0.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=92b8037da5b70b838c848bfbb6e90fe3
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 464428875517..9b6f5021f1ad 100644
Binary files a/metadata/md5-cache/app-xemacs/Manifest.gz and b/metadata/md5-cache/app-xemacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-xemacs/mail-lib-1.85 b/metadata/md5-cache/app-xemacs/mail-lib-1.85
index dcf375ac9d7a..c566c5a98cdf 100644
--- a/metadata/md5-cache/app-xemacs/mail-lib-1.85
+++ b/metadata/md5-cache/app-xemacs/mail-lib-1.85
@@ -2,10 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Fundamental lisp files for providing email support
 EAPI=7
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+INHERIT=xemacs-packages
+KEYWORDS=~alpha amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-eterm app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/ecrypto app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/mail-lib-1.85-pkg.tar.gz
 _eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=f718e81bf7e6a5f2bc434dd9f2c4dd1d
+_md5_=651bc65b0c0056fbb7f6ae2f59d76571
diff --git a/metadata/md5-cache/app-xemacs/mmm-mode-1.09 b/metadata/md5-cache/app-xemacs/mmm-mode-1.09
index 3b2440d05a11..877cff90a603 100644
--- a/metadata/md5-cache/app-xemacs/mmm-mode-1.09
+++ b/metadata/md5-cache/app-xemacs/mmm-mode-1.09
@@ -2,10 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Multiple major modes in a single buffer
 EAPI=7
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+INHERIT=xemacs-packages
+KEYWORDS=~alpha amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/mmm-mode-1.09-pkg.tar.gz
 _eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=ee53c3b5c4e824cd727939e6f7dea5cd
+_md5_=8addf670cacacf4e5d5d8fcc58469090
diff --git a/metadata/md5-cache/app-xemacs/prog-modes-2.34 b/metadata/md5-cache/app-xemacs/prog-modes-2.34
index 23309d38d45f..6bee6b084852 100644
--- a/metadata/md5-cache/app-xemacs/prog-modes-2.34
+++ b/metadata/md5-cache/app-xemacs/prog-modes-2.34
@@ -2,10 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Support for various programming languages
 EAPI=7
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+INHERIT=xemacs-packages
+KEYWORDS=~alpha amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-devel app-xemacs/xemacs-base app-xemacs/cc-mode app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/ediff app-xemacs/emerge app-xemacs/efs app-xemacs/vc app-xemacs/speedbar app-xemacs/dired app-xemacs/ilisp app-xemacs/sh-script app-xemacs/cedet-common app-xemacs/w3 app-xemacs/gnus app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/prog-modes-2.34-pkg.tar.gz
 _eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=191e3e4c8d628c6a9c5bf83970ebe585
+_md5_=353f4512d770f0091fe6cd5277194fcb
diff --git a/metadata/md5-cache/app-xemacs/w3-1.42 b/metadata/md5-cache/app-xemacs/w3-1.42
index b96a1d61de9c..49707c9e8e7a 100644
--- a/metadata/md5-cache/app-xemacs/w3-1.42
+++ b/metadata/md5-cache/app-xemacs/w3-1.42
@@ -2,10 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Web browser
 EAPI=7
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+INHERIT=xemacs-packages
+KEYWORDS=~alpha amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/ecrypto app-xemacs/gnus app-xemacs/net-utils app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/w3-1.42-pkg.tar.gz
 _eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=4ee7af80632b2c7e964fdc9d3a94ef08
+_md5_=ec15fc0b9e85a6d263789f56a2e049bc
diff --git a/metadata/md5-cache/app-xemacs/xwem-1.27 b/metadata/md5-cache/app-xemacs/xwem-1.27
index 9b7877bc5818..f47284b58457 100644
--- a/metadata/md5-cache/app-xemacs/xwem-1.27
+++ b/metadata/md5-cache/app-xemacs/xwem-1.27
@@ -2,10 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=X Emacs Window Manager
 EAPI=7
 HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+INHERIT=xemacs-packages
+KEYWORDS=~alpha amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-xemacs/xemacs-base app-xemacs/xlib app-xemacs/strokes app-xemacs/edit-utils app-xemacs/text-modes app-xemacs/time app-xemacs/slider app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib app-xemacs/apel app-editors/xemacs
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/xwem-1.27-pkg.tar.gz
 _eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=61c4238ad0fe420ba3698462b34c61cf
+_md5_=ff3d2cee74aea0c2dca7894d3af17e38
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 58e03f80dfbd..b78c48d5e637 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/pstreams-1.0.1 b/metadata/md5-cache/dev-cpp/pstreams-1.0.1
index e1f0881a0698..9ff5a2785d49 100644
--- a/metadata/md5-cache/dev-cpp/pstreams-1.0.1
+++ b/metadata/md5-cache/dev-cpp/pstreams-1.0.1
@@ -10,4 +10,4 @@ LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/pstreams/pstreams-1.0.1.tar.gz doc? ( mirror://sourceforge/pstreams/pstreams-docs-1.0.1.tar.gz )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5be0ea9e6399e68ee287e6386998ce01
+_md5_=6e707debe8aad2579d453f3a6091abdc
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index f7f1b3fc4881..f7bacc036097 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.7.0 b/metadata/md5-cache/dev-embedded/stlink-1.7.0
index 010d7a157a0b..9edb9984c83c 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.7.0
+++ b/metadata/md5-cache/dev-embedded/stlink-1.7.0
@@ -11,4 +11,4 @@ RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/v1.7.0.tar.gz -> stlink-1.7.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ef131998eefac5e16d0e1bf725d53903
+_md5_=17d33970438306cf44669740652c7fa1
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 96ad8c203465..40e345f104ab 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/gson-2.9.0-r1 b/metadata/md5-cache/dev-java/gson-2.9.0-r1
index 4a4ddaa4d076..7c0bb48d0c39 100644
--- a/metadata/md5-cache/dev-java/gson-2.9.0-r1
+++ b/metadata/md5-cache/dev-java/gson-2.9.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/gson
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.9
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz -> gson-2.9.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=592c7049eac2190a1afc737546045821
+_md5_=bf6a4e68bde9c5858937641290a3fb8e
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
index c3528cd0b079..66c2fe92c112 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AdoptOpenJDK/IcedTea-Web
 INHERIT=autotools bash-completion-r1 cargo java-pkg-2 readme.gentoo-r1 xdg-utils
 IUSE=doc debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 arm64 ~ppc64 ~x86
 LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=06c63f45f233bf69b9706a234128e076
+_md5_=b47df0c27d72ebb389285b570bcedfae
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r2 b/metadata/md5-cache/dev-java/reflections-0.9.12-r2
index 808d9c9409c6..30aabf4212c5 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r2
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ronmamo/reflections
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=WTFPL-2 BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.9 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=d1399bc4d9841e2cece22e580e1b4c97
+_md5_=3fb37fd7f322eb91b4f56f5555e7c0ca
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 86f8b9f2eaf7..826c01ced82d 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/R-4.2.0 b/metadata/md5-cache/dev-lang/R-4.2.0
index f8c7e2d1ea6c..6da2b9ce47fc 100644
--- a/metadata/md5-cache/dev-lang/R-4.2.0
+++ b/metadata/md5-cache/dev-lang/R-4.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.r-project.org/
 INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2 app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= >=dev-libs/tre-0.8.0_p20210321[approx] net-libs/libtirpc net-misc/curl virtual/blas sys-libs/zlib[minizip] || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:=[X=] x11-libs/pango:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:= ) readline? ( sys-libs/readline:= ) tiff? ( media-libs/tiff:= ) tk? ( dev-lang/tk:= ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xdg-utils ) java? ( >=virtual/jre-1.8:* ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -14,4 +14,4 @@ RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.2.0.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a8d8ecc1afd6286087bb417f1272a693
+_md5_=3d6996504df8264275b7ae7175e4186d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index f59f40956f3e..8d964e8a31a0 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.20 b/metadata/md5-cache/dev-libs/libtermkey-0.20
deleted file mode 100644
index 0b080edc7dd0..000000000000
--- a/metadata/md5-cache/dev-libs/libtermkey-0.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/unibilium:= sys-devel/libtool virtual/pkgconfig demos? ( dev-libs/glib:2 )
-DESCRIPTION=Library for easy processing of keyboard entry from terminal-based programs
-EAPI=6
-HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
-INHERIT=flag-o-matic
-IUSE=demos static-libs
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/unibilium:=
-SLOT=0
-SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6506f04e47631b255d1a5c33b2b3ee4d
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1o-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1o-r1
new file mode 100644
index 000000000000..55cf08e5c367
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1o-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) !<net-misc/openssh-8.0_p1-r3
+RESTRICT=!test? ( test )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1o.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/openssl/openssl-1.1.1o-test-fixes-expiry.patch.xz verify-sig? ( mirror://openssl/source/openssl-1.1.1o.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=c0b27ce598ac35c854df1330371c0385
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.3 b/metadata/md5-cache/dev-libs/openssl-3.0.3
index a224946d9b44..57e5f8de6b0e 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.3
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.3.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/openssl/openssl-3.0.3-test-fixes-expiry.patch.xz verify-sig? ( mirror://openssl/source/openssl-3.0.3.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fb1cb5ec0e2137325cff3b80c6cfb9a6
+_md5_=d45332fffdbbc779ceaa15836cd8c41a
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1o b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1o
new file mode 100644
index 000000000000..f4a825b0df35
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1o
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!=dev-libs/openssl-1.1.1*:0 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=openssl
+RDEPEND=!=dev-libs/openssl-1.1.1*:0 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=1.1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1o.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/openssl/openssl-1.1.1o-test-fixes-expiry.patch.xz verify-sig? ( mirror://openssl/source/openssl-1.1.1o.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a07c2a71108e9fdc5b4788dc00775b9d
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.0.0 b/metadata/md5-cache/dev-libs/unibilium-2.0.0
deleted file mode 100644
index 849d993f0420..000000000000
--- a/metadata/md5-cache/dev-libs/unibilium-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl sys-devel/libtool
-DESCRIPTION=A very basic terminfo library
-EAPI=6
-HOMEPAGE=https://github.com/mauke/unibilium/
-INHERIT=flag-o-matic
-IUSE=static-libs
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=LGPL-3+ MIT
-SLOT=0/4
-SRC_URI=https://github.com/mauke/unibilium/archive/v2.0.0.tar.gz -> unibilium-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9553102d19cca4daccdf05936805423d
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.1.0 b/metadata/md5-cache/dev-libs/unibilium-2.1.0
deleted file mode 100644
index 2f2112fc4248..000000000000
--- a/metadata/md5-cache/dev-libs/unibilium-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/libtool
-DEFINED_PHASES=compile install
-DESCRIPTION=A very basic terminfo library
-EAPI=7
-HOMEPAGE=https://github.com/neovim/unibilium/
-INHERIT=flag-o-matic toolchain-funcs
-IUSE=static-libs
-KEYWORDS=amd64 arm ~arm64 x86 ~x64-macos
-LICENSE=LGPL-3+ MIT
-SLOT=0/4
-SRC_URI=https://github.com/neovim/unibilium/archive/v2.1.0.tar.gz -> unibilium-2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=175e9d25c577fd03c37bbf93956706cd
diff --git a/metadata/md5-cache/dev-python/Faker-13.13.0 b/metadata/md5-cache/dev-python/Faker-13.13.0
new file mode 100644
index 000000000000..e4f184d0d0d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-13.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[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(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
+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/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-13.13.0.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f3bf23f934b35863ff1c0a26b844f327
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 33ca00615ccd..894077a6dc9b 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1 b/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
index 4225dbf89468..ac98c6705705 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/gunicorn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( !ia64? ( dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/async_timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] >=dev-python/alabaster-0.6.2[python_targets_pypy3(-)] dev-python/sphinxcontrib-asyncio[python_targets_pypy3(-)] dev-python/sphinxcontrib-blockdiag[python_targets_pypy3(-)] dev-python/sphinxcontrib-newsfeed[python_targets_pypy3(-)] dev-python/sphinxcontrib-spelling[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-aiohttp-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] www-servers/gunicorn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( !ia64? ( dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async_timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_11(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_11(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_11(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_11(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] >=dev-python/alabaster-0.6.2[python_targets_pypy3(-)] dev-python/sphinxcontrib-asyncio[python_targets_pypy3(-)] dev-python/sphinxcontrib-blockdiag[python_targets_pypy3(-)] dev-python/sphinxcontrib-newsfeed[python_targets_pypy3(-)] dev-python/sphinxcontrib-spelling[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-aiohttp-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=http client/server for asyncio
 EAPI=8
 HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
 INHERIT=distutils-r1 multiprocessing
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test doc 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/async_timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async_timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/a/aiohttp/aiohttp-3.8.1.tar.gz
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=25d5beb788d41e4792fec0d546737af7
+_md5_=e567ae339a8318f35767caef11eaf199
diff --git a/metadata/md5-cache/dev-python/aioresponses-0.7.3-r1 b/metadata/md5-cache/dev-python/aioresponses-0.7.3-r1
index 6f6169994ea7..ca5b36d9d448 100644
--- a/metadata/md5-cache/dev-python/aioresponses-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/aioresponses-0.7.3-r1
@@ -2,7 +2,7 @@ BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Helper to mock/fake web requests in Python's aiohttp package
 EAPI=8
-HOMEPAGE=https://github.com/pnuckowski/aioresponses
+HOMEPAGE=https://github.com/pnuckowski/aioresponses/ https://pypi.org/project/aioresponses/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aioresponses/aioresponses-0.7.3.tar.gz
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7505d5c4902b44ce656b021fb0b552a5
+_md5_=1247c3b5dac6e60b35bd4a835634f11d
diff --git a/metadata/md5-cache/dev-python/autobahn-22.5.1-r1 b/metadata/md5-cache/dev-python/autobahn-22.5.1-r1
index c4a7e97ecb92..88335ebf9689 100644
--- a/metadata/md5-cache/dev-python/autobahn-22.5.1-r1
+++ b/metadata/md5-cache/dev-python/autobahn-22.5.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/wsaccel-0.6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snappy-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ujson-4.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cbor2-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/py-ubjson-0.16.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flatbuffers-1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-20.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/service_identity-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pynacl-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytrie-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/argon2-cffi-20.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.7.4[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/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/wsaccel-0.6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snappy-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ujson-4.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cbor2-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/py-ubjson-0.16.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flatbuffers-1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-20.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/service_identity-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytrie-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/argon2-cffi-20.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/passlib-1.7.4[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-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-aiohttp[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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 postinst postrm prepare test
 DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
 EAPI=8
 HOMEPAGE=https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python/ https://pypi.org/project/autobahn/
 INHERIT=distutils-r1 optfeature
-IUSE=test xbr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test xbr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/zope-interface-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-21.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/zope-interface-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-21.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/a/autobahn/autobahn-22.5.1.tar.gz
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=86d9e17d63be6eea1fa918614c6065a0
+_md5_=886e59c216e7b575c758611e52ae4e94
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.7 b/metadata/md5-cache/dev-python/boto3-1.24.7
new file mode 100644
index 000000000000..bc454f4a6aa5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/boto/boto3/archive/1.24.7.tar.gz -> boto3-1.24.7.gh.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.7 b/metadata/md5-cache/dev-python/botocore-1.27.7
new file mode 100644
index 000000000000..e822f3637585
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/b/botocore/botocore-1.27.7.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee9407b3e9a7645dd37c00caade8c434
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.3.4 b/metadata/md5-cache/dev-python/bottleneck-1.3.4
index f7cc790a6da3..85762eb8e7f0 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.4
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.4
@@ -1,17 +1,17 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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
-DEPEND=>=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=>=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Fast NumPy array functions written in C
 EAPI=8
-HOMEPAGE=https://pypi.org/project/Bottleneck/
+HOMEPAGE=https://github.com/pydata/bottleneck/ https://pypi.org/project/Bottleneck/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/pydata/bottleneck/archive/v1.3.4.tar.gz -> bottleneck-1.3.4.gh.tar.gz
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8dbec553673752c0a154db321b59fb04
+_md5_=d5e5d9a946fd67590fc33fb3fc63b9a5
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.6 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.6
new file mode 100644
index 000000000000..129e48e649c9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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=A locking API for expiring values while a single thread generates a new value
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/d/dogpile.cache/dogpile.cache-1.1.6.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8035d4d0d984bd0ee5fc1b0f5f912bea
diff --git a/metadata/md5-cache/dev-python/fsspec-2022.5.0 b/metadata/md5-cache/dev-python/fsspec-2022.5.0
deleted file mode 100644
index 10b6ea5d654f..000000000000
--- a/metadata/md5-cache/dev-python/fsspec-2022.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A specification that python filesystems should adhere to
-EAPI=8
-HOMEPAGE=https://github.com/fsspec/filesystem_spec/ https://pypi.org/project/fsspec/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/fsspec/filesystem_spec/archive/2022.5.0.tar.gz -> filesystem_spec-2022.5.0.tar.gz
-_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=23814681124971faf22efeff2ef34ece
diff --git a/metadata/md5-cache/dev-python/fsspec-2022.5.0-r1 b/metadata/md5-cache/dev-python/fsspec-2022.5.0-r1
new file mode 100644
index 000000000000..afd6d32afaee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fsspec-2022.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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=A specification that python filesystems should adhere to
+EAPI=8
+HOMEPAGE=https://github.com/fsspec/filesystem_spec/ https://pypi.org/project/fsspec/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/fsspec/filesystem_spec/archive/2022.5.0.tar.gz -> filesystem_spec-2022.5.0.gh.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6a186866a2ad2d537ebdea50e302994c
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.47.1 b/metadata/md5-cache/dev-python/hypothesis-6.47.1
new file mode 100644
index 000000000000..f5848fc4460c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.47.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[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(-)?] ) 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/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.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/pypy3-7.3.7-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+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/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.47.1.tar.gz -> hypothesis-hypothesis-python-6.47.1.gh.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6fdf46efc712bce6e4d5ce83ad402b1d
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.3.2 b/metadata/md5-cache/dev-python/jupyter_client-7.3.2
deleted file mode 100644
index ec17c8510fb7..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.3.2.tar.gz
-_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0038c8df7e47a23f3302d0263a2cd044
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.3.3 b/metadata/md5-cache/dev-python/jupyter_client-7.3.3
deleted file mode 100644
index 4dc0674869ef..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_client/ https://pypi.org/project/jupyter-client/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.3.3.tar.gz
-_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=09e6e4109ee6e94eb87e3eb08fe3f571
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.14.2 b/metadata/md5-cache/dev-python/openapi-core-0.14.2
index 4bfd26902252..823987322c92 100644
--- a/metadata/md5-cache/dev-python/openapi-core-0.14.2
+++ b/metadata/md5-cache/dev-python/openapi-core-0.14.2
@@ -1,4 +1,4 @@
-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/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.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/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.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.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
@@ -13,4 +13,4 @@ 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	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6263adcdb4a260093ebf88906f32fd36
+_md5_=1038ba9a19c824eb1f9322d512a9697f
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.50 b/metadata/md5-cache/dev-python/phonenumbers-8.12.50
new file mode 100644
index 000000000000..38457eeca87d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.50
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.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=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/daviddrysdale/python-phonenumbers/archive/v8.12.50.tar.gz -> python-phonenumbers-8.12.50.gh.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=edad0be3a7edc661e4f25ca06ba32ce7
diff --git a/metadata/md5-cache/dev-python/plotly-5.8.2 b/metadata/md5-cache/dev-python/plotly-5.8.2
new file mode 100644
index 000000000000..def1a66be09c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/plotly-5.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-python/backports-tempfile[python_targets_python3_8(-)?] ) dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab[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/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[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/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[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(-)?] sci-libs/scikit-image[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.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=Browser-based graphing library for Python
+EAPI=8
+HOMEPAGE=https://plotly.com/python/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/plotly/plotly-5.8.2.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=0a503b72c67487b0c801515a158d4a8e
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.45 b/metadata/md5-cache/dev-python/pyghmi-1.5.45
new file mode 100644
index 000000000000..b8aa771ec9fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.45
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure python implementation of IPMI protocol
+EAPI=8
+HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/pyghmi/pyghmi-1.5.45.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c2f9f76cea3d11599a7bb56cc4ee84ef
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4 b/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4
index e271d204670b..4c86ef6db4f8 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-python/setuptools_scm-6.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/aiohttp-3.8.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.17.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/setuptools_scm-6.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/aiohttp-3.8.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.17.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.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/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin for aiohttp support
 EAPI=8
-HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/
+HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/ https://pypi.org/project/pytest-aiohttp/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-3.8.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.17.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/aiohttp-3.8.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.17.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-1.0.4.tar.gz
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=11b9660fb6f5d8ef05e0dd6d2f79daf3
+_md5_=e02058cd6702c7c7fae15ea23b847349
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.18.3 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.18.3
new file mode 100644
index 000000000000..8679cbfa2404
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.18.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/nptyping-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphobjinv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.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=Type hints support for the Sphinx autodoc extension
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/sphinx-autodoc-typehints/ https://pypi.org/project/sphinx-autodoc-typehints/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/tox-dev/sphinx-autodoc-typehints/archive/1.18.3.tar.gz -> sphinx-autodoc-typehints-1.18.3.gh.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e2af2245c23de4f22a42e0e7b09ad230
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-2.3.1-r1 b/metadata/md5-cache/dev-python/spyder-kernels-2.3.1-r2
similarity index 63%
rename from metadata/md5-cache/dev-python/spyder-kernels-2.3.1-r1
rename to metadata/md5-cache/dev-python/spyder-kernels-2.3.1-r2
index 45922a4c1f7a..a639aebdfb64 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-2.3.1-r1
+++ b/metadata/md5-cache/dev-python/spyder-kernels-2.3.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[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/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[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/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipykernel-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-6.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-7.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-7.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[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/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[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/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipykernel-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-6.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-7.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.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=Kernels used by spyder on its ipython console
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipykernel-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-6.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-7.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-7.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipykernel-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-6.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-7.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/spyder-ide/spyder-kernels/archive/v2.3.1.tar.gz -> spyder-kernels-2.3.1.gh.tar.gz
 _eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4adafec6f784957a06c970c5f0513de5
+_md5_=44400226b7591626b7970e41bec8423f
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.9 b/metadata/md5-cache/dev-python/watchdog-2.1.9
new file mode 100644
index 000000000000..aef4efaad940
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-timeout-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.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/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python API and shell utilities to monitor file system events
+EAPI=8
+HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyyaml[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/gorakhargosh/watchdog/archive/v2.1.9.tar.gz -> watchdog-2.1.9.gh.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=58ec84d9419f6dbf3a5b4a0bf3297e17
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6554a4938952..fa336ff41b4b 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/gh-0.18.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
new file mode 100644
index 000000000000..63cf74adf379
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/webmock[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/webmock[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby26(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby26(-)] ) >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby26(-)] dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby26(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby26(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby26(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby27(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby27(-)] dev-ruby/faraday:1[ruby_targets_ruby27(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby27(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby27(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby27(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=multi-layer client for the github api v3
+EAPI=8
+HOMEPAGE=https://github.com/travis-ci/gh
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby26(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby26(-)] ) >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby26(-)] dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby26(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby26(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby26(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby27(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby27(-)] dev-ruby/faraday:1[ruby_targets_ruby27(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby27(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby27(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby27(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/travis-ci/gh/archive/v0.18.0.tar.gz -> gh-0.18.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d20710d26d509542348079efe03ba5d1
diff --git a/metadata/md5-cache/dev-ruby/travis-1.11.1 b/metadata/md5-cache/dev-ruby/travis-1.11.1
new file mode 100644
index 000000000000..1744dc282307
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/travis-1.11.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby26(-)] >=dev-ruby/gh-0.17[ruby_targets_ruby26(-)] dev-ruby/highline:2[ruby_targets_ruby26(-)] >=dev-ruby/json-2.3:2[ruby_targets_ruby26(-)] >=dev-ruby/launchy-2.1[ruby_targets_ruby26(-)] >dev-ruby/pusher-client-0.4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-vcs/git ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Travis CI Client (CLI and Ruby library)
+EAPI=8
+HOMEPAGE=https://github.com/travis-ci/travis.rb
+INHERIT=bash-completion-r1 ruby-fakegem
+IUSE=test ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-vcs/git ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby26(-)] >=dev-ruby/gh-0.17[ruby_targets_ruby26(-)] dev-ruby/highline:2[ruby_targets_ruby26(-)] >=dev-ruby/json-2.3:2[ruby_targets_ruby26(-)] >=dev-ruby/launchy-2.1[ruby_targets_ruby26(-)] >dev-ruby/pusher-client-0.4[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/travis-1.11.1.gem
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7ca00871e6ecd857da19f5a5dea746fe
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 963a36a069bc..25f7c9f91203 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a-r1 b/metadata/md5-cache/dev-util/cscope-15.8a-r1
deleted file mode 100644
index ef4240e800db..000000000000
--- a/metadata/md5-cache/dev-util/cscope-15.8a-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* ) sys-devel/flex virtual/pkgconfig virtual/yacc 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
-DESCRIPTION=Interactively examine a C program
-EAPI=6
-HOMEPAGE=http://cscope.sourceforge.net/
-INHERIT=autotools elisp-common toolchain-funcs
-IUSE=emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=BSD GPL-2+
-RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
-SLOT=0
-SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ceac20d82a4a227e20c6ec8177b0acd2
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a-r2 b/metadata/md5-cache/dev-util/cscope-15.8a-r2
deleted file mode 100644
index efbfc1282e75..000000000000
--- a/metadata/md5-cache/dev-util/cscope-15.8a-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* ) sys-devel/flex virtual/pkgconfig virtual/yacc 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
-DESCRIPTION=Interactively examine a C program
-EAPI=6
-HOMEPAGE=http://cscope.sourceforge.net/
-INHERIT=autotools elisp-common toolchain-funcs
-IUSE=emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD GPL-2+
-RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
-SLOT=0
-SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9b619d8906cdd7e64f1fe5bc8952cd92
diff --git a/metadata/md5-cache/dev-util/ctags-20210321.0-r1 b/metadata/md5-cache/dev-util/ctags-20210321.0-r1
deleted file mode 100644
index 86a82f16e8b2..000000000000
--- a/metadata/md5-cache/dev-util/ctags-20210321.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
-DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
-EAPI=7
-HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
-INHERIT=autotools
-IUSE=json xml yaml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
-SLOT=0
-SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20210321.0.tar.gz -> ctags-20210321.0.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3006a2b96c2ed9dc92cc2d22f050b258
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index b4629ca625bc..1c67e67a8d80 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-2.32.0-r1 b/metadata/md5-cache/dev-vcs/git-2.32.0-r1
index 44a204b3b8db..18f410a66db6 100644
--- a/metadata/md5-cache/dev-vcs/git-2.32.0-r1
+++ b/metadata/md5-cache/dev-vcs/git-2.32.0-r1
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.32.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.32.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.32.0.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=860df902a623c4b7193356d39d0c5459
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c992cc7ead6cc342d136f9ca63d93c0a
diff --git a/metadata/md5-cache/dev-vcs/git-2.33.1 b/metadata/md5-cache/dev-vcs/git-2.33.1
index 52bde6076b1d..20bd0c5f854c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.33.1
+++ b/metadata/md5-cache/dev-vcs/git-2.33.1
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.33.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.33.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.33.1.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=32e817af9a2f33bef0693bfa0d0bb5eb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e94b173960384363be5330b49b931938
diff --git a/metadata/md5-cache/dev-vcs/git-2.34.1 b/metadata/md5-cache/dev-vcs/git-2.34.1
index 352cb608b3c3..a475faac165d 100644
--- a/metadata/md5-cache/dev-vcs/git-2.34.1
+++ b/metadata/md5-cache/dev-vcs/git-2.34.1
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.34.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.34.1.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dd959a55af3558357adb06601e3b9fd2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6778ab3c60e6676e2db253ea633b7195
diff --git a/metadata/md5-cache/dev-vcs/git-2.34.1-r1 b/metadata/md5-cache/dev-vcs/git-2.34.1-r1
index f0549278dfdd..4d39b74c37ef 100644
--- a/metadata/md5-cache/dev-vcs/git-2.34.1-r1
+++ b/metadata/md5-cache/dev-vcs/git-2.34.1-r1
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.34.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.34.1.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e00172f6c0e2ddf4656e602c8436d4db
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d4c65f81d4f15979dde3311567323050
diff --git a/metadata/md5-cache/dev-vcs/git-2.35.1 b/metadata/md5-cache/dev-vcs/git-2.35.1
index a21033ddc143..2ac9108db026 100644
--- a/metadata/md5-cache/dev-vcs/git-2.35.1
+++ b/metadata/md5-cache/dev-vcs/git-2.35.1
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.35.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.35.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.35.1.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7a3effbe94d33c0be2c55b2f77c8a805
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f1eec0841b36ebdec3d65164e561dda8
diff --git a/metadata/md5-cache/dev-vcs/git-2.35.2 b/metadata/md5-cache/dev-vcs/git-2.35.2
index 5548490be806..ddd36453e2d4 100644
--- a/metadata/md5-cache/dev-vcs/git-2.35.2
+++ b/metadata/md5-cache/dev-vcs/git-2.35.2
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.35.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.35.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.35.2.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=59bb3719c1bdcb0c5a4f61a3db2aa23f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7379209f99e514fcf94cae32d392fb02
diff --git a/metadata/md5-cache/dev-vcs/git-2.35.3 b/metadata/md5-cache/dev-vcs/git-2.35.3
index fb3ff495f1e1..bdeac6d9263f 100644
--- a/metadata/md5-cache/dev-vcs/git-2.35.3
+++ b/metadata/md5-cache/dev-vcs/git-2.35.3
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.35.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.35.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.35.3.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e993aa54a1788b2221e0d2c6d12f4e34
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88b0670cee493b450215b124dd461ff7
diff --git a/metadata/md5-cache/dev-vcs/git-2.36.0 b/metadata/md5-cache/dev-vcs/git-2.36.0
index f9d966d93bee..44bfbfc02580 100644
--- a/metadata/md5-cache/dev-vcs/git-2.36.0
+++ b/metadata/md5-cache/dev-vcs/git-2.36.0
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.36.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.36.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.36.0.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e993aa54a1788b2221e0d2c6d12f4e34
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88b0670cee493b450215b124dd461ff7
diff --git a/metadata/md5-cache/dev-vcs/git-2.36.1 b/metadata/md5-cache/dev-vcs/git-2.36.1
index cac487bfdab3..130ba6815458 100644
--- a/metadata/md5-cache/dev-vcs/git-2.36.1
+++ b/metadata/md5-cache/dev-vcs/git-2.36.1
@@ -1,11 +1,11 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.36.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.36.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.36.1.tar.xz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e993aa54a1788b2221e0d2c6d12f4e34
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88b0670cee493b450215b124dd461ff7
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index fff0de32d82a..5df9d92f3029 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e993aa54a1788b2221e0d2c6d12f4e34
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88b0670cee493b450215b124dd461ff7
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index fff0de32d82a..5df9d92f3029 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e993aa54a1788b2221e0d2c6d12f4e34
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88b0670cee493b450215b124dd461ff7
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index fff0de32d82a..5df9d92f3029 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e993aa54a1788b2221e0d2c6d12f4e34
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88b0670cee493b450215b124dd461ff7
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index fff0de32d82a..5df9d92f3029 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=8
 HOMEPAGE=https://www.git-scm.com/
-INHERIT=toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd git-r3
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e993aa54a1788b2221e0d2c6d12f4e34
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88b0670cee493b450215b124dd461ff7
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 6136957e8a62..b06c7684b740 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0 b/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0
index 1bb808a61ebe..129335c6f35b 100644
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0
@@ -5,10 +5,10 @@ DESCRIPTION=High speed arctic racing game based on Tux Racer
 EAPI=7
 HOMEPAGE=https://sourceforge.net/p/extremetuxracer/wiki/Home/
 INHERIT=autotools desktop xdg-utils
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=media-libs/libsfml-2.4:0= virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=https://download.sourceforge.net/extremetuxracer/etr-0.8.0.tar.xz -> extreme-tuxracer-0.8.0.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2b4122d06e2691d2122c0f3b0fca311e
+_md5_=fd9bb92f45d09e1abbd074f6665a7b6d
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index b2b0ed079f8d..2f0579de7709 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.54.4 b/metadata/md5-cache/gnome-base/librsvg-2.54.4
new file mode 100644
index 000000000000..e1ec793af06b
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/librsvg-2.54.4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/cairo-1.16.0[glib,svg,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.9: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/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0: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/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4: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/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) >=virtual/rust-1.56[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gi-docgen ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) dev-libs/gobject-introspection-common dev-libs/vala-common >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg
+INHERIT=gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+IUSE=gtk-doc +introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=x11-libs/cairo-1.16.0[glib,svg,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.9: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/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0: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/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4: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/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://gnome/sources/librsvg/2.54/librsvg-2.54.4.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=952280afe35a4b027a3e1f78938c4ffb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 6d53f38dfe59..8dd583cd1697 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/dssi-1.1.1-r1 b/metadata/md5-cache/media-libs/dssi-1.1.1-r1
index dcd89ce18373..4decf9cdf35d 100644
--- a/metadata/md5-cache/media-libs/dssi-1.1.1-r1
+++ b/metadata/md5-cache/media-libs/dssi-1.1.1-r1
@@ -10,4 +10,4 @@ RDEPEND=media-libs/alsa-lib >=media-libs/liblo-0.12 virtual/jack >=media-libs/la
 SLOT=0
 SRC_URI=mirror://sourceforge/dssi/dssi-1.1.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=84a5f5bd6d6da015ae4b4d6cf1791528
+_md5_=6acefdfb1536cdf9441738b4ae54fe5f
diff --git a/metadata/md5-cache/media-libs/libpulse-16.0 b/metadata/md5-cache/media-libs/libpulse-16.0
index 4a710bb2c424..74638424eb74 100644
--- a/metadata/md5-cache/media-libs/libpulse-16.0
+++ b/metadata/md5-cache/media-libs/libpulse-16.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
 IUSE=+asyncns dbus doc +glib gtk selinux systemd tcpd test valgrind 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[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.28.0: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(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=911ef1476eb5bc09f561398e54c26c49
+_md5_=16bd5b7b2a9bd0a75a3e2f47aadc68f5
diff --git a/metadata/md5-cache/media-libs/libsfml-2.5.1 b/metadata/md5-cache/media-libs/libsfml-2.5.1
index 1a8e2e8f7a9b..d07cedd60f69 100644
--- a/metadata/md5-cache/media-libs/libsfml-2.5.1
+++ b/metadata/md5-cache/media-libs/libsfml-2.5.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.sfml-dev.org/ https://github.com/SFML/SFML
 INHERIT=cmake
 IUSE=debug doc examples
-KEYWORDS=amd64 ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=ZLIB
 RDEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image )
 SLOT=0/2.5
 SRC_URI=https://github.com/SFML/SFML/archive/2.5.1.tar.gz -> libsfml-2.5.1.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cdfc05f93e7badfdd44273c59712db29
+_md5_=7ea32383dfb6d815c6fddde50700335a
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 864782716688..910b2e3bc864 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/pulseaudio-16.0 b/metadata/md5-cache/media-sound/pulseaudio-16.0
index 1b5d63ef85d6..bfc4e2d3c5ca 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-16.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-16.0
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=multilib-minimal
 IUSE=bluetooth +daemon +glib jack ofono-headset abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=media-libs/libpulse-16.0[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.0[bluetooth?,glib?,jack?,ofono-headset?] )
 SLOT=0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2214aa6f438d76ea9ade43c1c65d0dd7
+_md5_=05145c7e12d2f55e953d1820d9cd71cf
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
index b1c4f78e9f4a..aee4e39cb97c 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
 IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer gtk ipv6 jack ldac lirc ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
 RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=89174e079279d86529b828980dadccde
+_md5_=6776bee63b0278b4890d69042569bca6
diff --git a/metadata/md5-cache/media-sound/strawberry-1.0.5 b/metadata/md5-cache/media-sound/strawberry-1.0.5
new file mode 100644
index 000000000000..a450e2d8fd10
--- /dev/null
+++ b/metadata/md5-cache/media-sound/strawberry-1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib >=media-libs/taglib-1.11.1_p20181028 x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( >=media-libs/chromaprint-1.4:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qttest:5
+DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
+EAPI=8
+HOMEPAGE=https://www.strawberrymusicplayer.org/
+INHERIT=cmake flag-o-matic plocale xdg
+IUSE=cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib >=media-libs/taglib-1.11.1_p20181028 x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( >=media-libs/chromaprint-1.4:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=cdda? ( gstreamer ) || ( gstreamer vlc )
+SLOT=0
+SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.0.5/strawberry-1.0.5.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=33c187243dd82229aa825f9ef90a3e60
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 8d3004771ad4..5927dd8e22a3 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/yle-dl-20220610 b/metadata/md5-cache/media-video/yle-dl-20220610
new file mode 100644
index 000000000000..952f227373bc
--- /dev/null
+++ b/metadata/md5-cache/media-video/yle-dl-20220610
@@ -0,0 +1,17 @@
+BDEPEND=test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-video/ffmpeg[gnutls] dev-python/pip[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/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Download media files from Yle Areena
+EAPI=8
+HOMEPAGE=https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl
+INHERIT=distutils-r1 optfeature
+IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+PROPERTIES=test_network
+RDEPEND=media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aajanki/yle-dl/archive/20220610.tar.gz -> yle-dl-20220610.tar.gz
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b80d77ac304e5169e730f5d4cb58696d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 368495456059..248a551956e7 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.35.1 b/metadata/md5-cache/net-analyzer/netdata-1.35.1
new file mode 100644
index 000000000000..68dbc5e12e8e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.35.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=8
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/releases/download/v1.35.1/netdata-v1.35.1.tar.gz -> netdata-1.35.1.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=71965a59e3fb0916f43802b870d4eac7
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index a494ba5c1508..998f1b91d72f 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.0 b/metadata/md5-cache/net-dialup/freeradius-3.2.0
new file mode 100644
index 000000000000..e9fd91d61c7f
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.2.0
@@ -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 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=8
+HOMEPAGE=https://freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=firebird? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_0/freeradius-server-3.2.0.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=0c6116ac06fd4dbccab51fc465618316
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 194189c60486..49e252865e8d 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/prosody-0.12.1 b/metadata/md5-cache/net-im/prosody-0.12.1
new file mode 100644
index 000000000000..cff18261ea48
--- /dev/null
+++ b/metadata/md5-cache/net-im/prosody-0.12.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/busted[lua_targets_lua5-4(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/prosody acct-user/prosody lua_single_target_luajit? ( dev-lua/luaexpat[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luaexpat[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/luafilesystem[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luafilesystem[lua_targets_lua5-4(-)] ) dev-lua/luarocks[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-3(-)?,lua_single_target_lua5-4(-)?] lua_single_target_luajit? ( dev-lua/luasocket[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luasocket[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/lua-unbound[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-unbound[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-unbound[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lua-unbound[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/readline[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/readline[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/readline[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/readline[lua_targets_lua5-4(-)] ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) ldap? ( lua_single_target_luajit? ( dev-lua/lualdap[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lualdap[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lualdap[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lualdap[lua_targets_lua5-4(-)] ) ) libevent? ( lua_single_target_luajit? ( dev-lua/luaevent[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luaevent[lua_targets_lua5-4(-)] ) ) dev-libs/openssl:0= lua_single_target_lua5-1? ( lua_single_target_luajit? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-4? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_luajit? ( dev-lua/luadbi[mysql,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luadbi[mysql,lua_targets_lua5-4(-)] ) ) postgres? ( lua_single_target_luajit? ( dev-lua/luadbi[postgres,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luadbi[postgres,lua_targets_lua5-4(-)] ) ) sqlite? ( lua_single_target_luajit? ( dev-lua/luadbi[sqlite,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luadbi[sqlite,lua_targets_lua5-4(-)] ) ) ssl? ( lua_single_target_luajit? ( dev-lua/luasec[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luasec[lua_targets_lua5-4(-)] ) ) zlib? ( lua_single_target_luajit? ( dev-lua/lua-zlib[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lua-zlib[lua_targets_lua5-4(-)] ) ) lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) lua_single_target_lua5-4? ( dev-lang/lua:5.4[deprecated(+)] )
+DESCRIPTION=Prosody is a modern XMPP communication server
+EAPI=8
+HOMEPAGE=https://prosody.im/
+INHERIT=lua-single systemd tmpfiles toolchain-funcs
+IUSE=icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=acct-group/prosody acct-user/prosody lua_single_target_luajit? ( dev-lua/luaexpat[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luaexpat[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/luafilesystem[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luafilesystem[lua_targets_lua5-4(-)] ) dev-lua/luarocks[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-3(-)?,lua_single_target_lua5-4(-)?] lua_single_target_luajit? ( dev-lua/luasocket[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luasocket[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/lua-unbound[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-unbound[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-unbound[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lua-unbound[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/readline[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/readline[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/readline[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/readline[lua_targets_lua5-4(-)] ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) ldap? ( lua_single_target_luajit? ( dev-lua/lualdap[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lualdap[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lualdap[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lualdap[lua_targets_lua5-4(-)] ) ) libevent? ( lua_single_target_luajit? ( dev-lua/luaevent[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luaevent[lua_targets_lua5-4(-)] ) ) dev-libs/openssl:0= lua_single_target_lua5-1? ( lua_single_target_luajit? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-4? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_luajit? ( dev-lua/luadbi[mysql,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luadbi[mysql,lua_targets_lua5-4(-)] ) ) postgres? ( lua_single_target_luajit? ( dev-lua/luadbi[postgres,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luadbi[postgres,lua_targets_lua5-4(-)] ) ) sqlite? ( lua_single_target_luajit? ( dev-lua/luadbi[sqlite,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luadbi[sqlite,lua_targets_lua5-4(-)] ) ) ssl? ( lua_single_target_luajit? ( dev-lua/luasec[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/luasec[lua_targets_lua5-4(-)] ) ) zlib? ( lua_single_target_luajit? ( dev-lua/lua-zlib[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lua-zlib[lua_targets_lua5-4(-)] ) ) lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) lua_single_target_lua5-4? ( dev-lang/lua:5.4[deprecated(+)] ) selinux? ( sec-policy/selinux-jabber ) virtual/tmpfiles
+REQUIRED_USE=^^ ( icu idn ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://prosody.im/downloads/source/prosody-0.12.1.tar.gz
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1df281e4ef2ca03114ddebfd7d9f2b14
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ef7486c9456a..486a3050a453 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/librouteros-1.1.3 b/metadata/md5-cache/net-libs/librouteros-1.1.3
new file mode 100644
index 000000000000..0fc5f98a81e2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/librouteros-1.1.3
@@ -0,0 +1,14 @@
+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
+DEPEND=dev-libs/libgcrypt:0=
+DESCRIPTION=Library for accessing MikroTik's RouterOS via its API
+EAPI=8
+HOMEPAGE=https://octo.github.io/librouteros/
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/libgcrypt:0=
+SLOT=0
+SRC_URI=https://github.com/octo/librouteros/archive/refs/tags/librouteros-1.1.3.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9386a1e4ad177edeb355ad2137be97a9
diff --git a/metadata/md5-cache/net-libs/xdp-tools-1.2.3 b/metadata/md5-cache/net-libs/xdp-tools-1.2.3
index 8f40a4aaeeab..2071731ffaf1 100644
--- a/metadata/md5-cache/net-libs/xdp-tools-1.2.3
+++ b/metadata/md5-cache/net-libs/xdp-tools-1.2.3
@@ -10,4 +10,4 @@ LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=dev-libs/libbpf:= sys-libs/zlib net-libs/libpcap virtual/libelf
 SLOT=0
 SRC_URI=https://github.com/xdp-project/xdp-tools/archive/refs/tags/v1.2.3.tar.gz -> xdp-tools-1.2.3.tar.gz
-_md5_=538e9092bedf1f009a56992fb8b3014e
+_md5_=9f50bb85223ac2fd7e6d944c85830d39
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3a5dbbb0ed34..b7f4d5922eb9 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/ipv6calc-4.0.1 b/metadata/md5-cache/net-misc/ipv6calc-4.0.1
index d3fb483bcc07..fdd284335e54 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-4.0.1
+++ b/metadata/md5-cache/net-misc/ipv6calc-4.0.1
@@ -10,4 +10,4 @@ RDEPEND=cgi? ( dev-perl/URI dev-perl/Digest-SHA1 ) dev-libs/openssl:= geoip? ( >
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pbiering/ipv6calc/archive/4.0.1.tar.gz -> ipv6calc-4.0.1.tar.gz
-_md5_=b30fe013b3fdca1bfc5d1821757c66f8
+_md5_=d57e3b32b804979bd2766b68b70e5bef
diff --git a/metadata/md5-cache/net-misc/mptcpd-0.9 b/metadata/md5-cache/net-misc/mptcpd-0.9
index 71e296f752a9..da39b9538b7c 100644
--- a/metadata/md5-cache/net-misc/mptcpd-0.9
+++ b/metadata/md5-cache/net-misc/mptcpd-0.9
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/ell-0.30.0 elibc_musl? ( sys-libs/argp-standalone )
 SLOT=0/0.9
 SRC_URI=https://github.com/intel/mptcpd/releases/download/v0.9/mptcpd-0.9.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f1130aafbc1a5c6953cffe66d2367730
+_md5_=a9d7a2f44201b27dd98c004afa680ae6
diff --git a/metadata/md5-cache/net-misc/mptcpd-9999 b/metadata/md5-cache/net-misc/mptcpd-9999
index 544af6c1a664..349e3e826946 100644
--- a/metadata/md5-cache/net-misc/mptcpd-9999
+++ b/metadata/md5-cache/net-misc/mptcpd-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/ell-0.30.0 elibc_musl? ( sys-libs/argp-standalone )
 SLOT=0/9999
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f40643ac6dc8d984a307cb026ff0baac
+_md5_=4289233eecd4f23025492093f64e97d9
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 34ed98cac9a7..84742623cb68 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.9.0 b/metadata/md5-cache/sci-libs/netcdf-4.9.0
new file mode 100644
index 000000000000..c7dfbec9104f
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/netcdf-4.9.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
+DESCRIPTION=Scientific library and interface for array oriented data access
+EAPI=8
+HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
+INHERIT=cmake flag-o-matic
+IUSE=+dap doc examples hdf +hdf5 mpi szip test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=UCAR-Unidata
+RDEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
+REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
+RESTRICT=!test? ( test )
+SLOT=0/19
+SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.9.0.tar.gz -> netcdf-4.9.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8067af0ac79f8fe32475afea9601bcbb
diff --git a/metadata/md5-cache/sci-libs/symengine-0.6.0-r1 b/metadata/md5-cache/sci-libs/symengine-0.6.0-r1
deleted file mode 100644
index 2a50c884ff3d..000000000000
--- a/metadata/md5-cache/sci-libs/symengine-0.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools ) doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=Fast symbolic manipulation library, written in C++
-EAPI=7
-HOMEPAGE=https://github.com/sympy/symengine
-INHERIT=cmake flag-o-matic toolchain-funcs
-IUSE=arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools )
-RESTRICT=!test? ( test )
-SLOT=0/0.6
-SRC_URI=https://github.com/sympy/symengine/archive/v0.6.0.tar.gz -> symengine-0.6.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba28407f759585519bc77e4255f10e6d
diff --git a/metadata/md5-cache/sci-libs/symengine-0.7.0-r1 b/metadata/md5-cache/sci-libs/symengine-0.7.0-r1
deleted file mode 100644
index ede8ce72f4fd..000000000000
--- a/metadata/md5-cache/sci-libs/symengine-0.7.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools ) doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=Fast symbolic manipulation library, written in C++
-EAPI=7
-HOMEPAGE=https://github.com/sympy/symengine
-INHERIT=cmake flag-o-matic toolchain-funcs
-IUSE=arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools )
-RESTRICT=!test? ( test )
-SLOT=0/0.7
-SRC_URI=https://github.com/sympy/symengine/archive/v0.7.0.tar.gz -> symengine-0.7.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=84d1003dccf8fe2c25a92c1f99e01323
diff --git a/metadata/md5-cache/sci-libs/symengine-0.8.1-r1 b/metadata/md5-cache/sci-libs/symengine-0.8.1-r2
similarity index 97%
rename from metadata/md5-cache/sci-libs/symengine-0.8.1-r1
rename to metadata/md5-cache/sci-libs/symengine-0.8.1-r2
index 4867757c9dfe..ebd7cb0bb1ed 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.8.1-r1
+++ b/metadata/md5-cache/sci-libs/symengine-0.8.1-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/sympy/symengine/archive/v0.8.1.tar.gz -> symengine-0.8.1.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=006b2f660ec20e57aedee6a537dfe2fa
+_md5_=905654f30faa84050d3e886e3921d2e5
diff --git a/metadata/md5-cache/sci-libs/symengine-0.9.0-r1 b/metadata/md5-cache/sci-libs/symengine-0.9.0-r1
deleted file mode 100644
index 6f5e623c7042..000000000000
--- a/metadata/md5-cache/sci-libs/symengine-0.9.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) llvm? ( <sys-devel/llvm-14:= ) tcmalloc? ( dev-util/google-perftools ) dev-libs/cereal !!sys-devel/llvm:0
-DESCRIPTION=Fast symbolic manipulation library, written in C++
-EAPI=8
-HOMEPAGE=https://github.com/symengine/symengine
-INHERIT=cmake llvm toolchain-funcs
-IUSE=arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) llvm? ( <sys-devel/llvm-14:= ) tcmalloc? ( dev-util/google-perftools )
-RESTRICT=!test? ( test )
-SLOT=0/0.9
-SRC_URI=https://github.com/symengine/symengine/archive/v0.9.0.tar.gz -> symengine-0.9.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=09784693495b2ff6bdea0794d9dc9554
diff --git a/metadata/md5-cache/sci-libs/symengine-0.9.0 b/metadata/md5-cache/sci-libs/symengine-0.9.0-r2
similarity index 93%
rename from metadata/md5-cache/sci-libs/symengine-0.9.0
rename to metadata/md5-cache/sci-libs/symengine-0.9.0-r2
index c6dd0b80f14c..41d64b20abca 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.9.0
+++ b/metadata/md5-cache/sci-libs/symengine-0.9.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/symengine/symengine
 INHERIT=cmake llvm toolchain-funcs
 IUSE=arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) llvm? ( <sys-devel/llvm-14:= ) tcmalloc? ( dev-util/google-perftools )
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://github.com/symengine/symengine/archive/v0.9.0.tar.gz -> symengine-0.9.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=abc54216bd1ca695de6f3bdd8f1a9c99
+_md5_=9d7735ff514a2881ae372bdbda2c0f9f
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 5b366bfe4041..b393395a7205 100644
Binary files a/metadata/md5-cache/sec-keys/Manifest.gz and b/metadata/md5-cache/sec-keys/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-file-20220611 b/metadata/md5-cache/sec-keys/openpgp-keys-file-20220611
new file mode 100644
index 000000000000..1aacde3de2a1
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-file-20220611
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by Christos Zoulas (to sign file releases)
+EAPI=7
+HOMEPAGE=https://www.darwinsys.com/file/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-file/openpgp-keys-file-20220611-BE04995BA8F90ED0C0C176C471112AB16CB33B3A.asc
+_md5_=dcac5ddbca9b4e34d4c9bbba68afc0d0
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4ecf3fa5d365..31df0e9e3ef2 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/dchroot-0.12.1 b/metadata/md5-cache/sys-apps/dchroot-0.12.1
index b365ad46619a..7be73c7d23cd 100644
--- a/metadata/md5-cache/sys-apps/dchroot-0.12.1
+++ b/metadata/md5-cache/sys-apps/dchroot-0.12.1
@@ -10,4 +10,4 @@ RDEPEND=!dev-util/schroot[dchroot]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dchroot/dchroot_0.12.1.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5e76d10a262c3fc9fac8540c5f7e961f
+_md5_=ff54cc1022f11f45c49cd167d3b011c0
diff --git a/metadata/md5-cache/sys-apps/ethq-0.6.1 b/metadata/md5-cache/sys-apps/ethq-0.6.1
index 4a629ee9d8b8..1bf81014b023 100644
--- a/metadata/md5-cache/sys-apps/ethq-0.6.1
+++ b/metadata/md5-cache/sys-apps/ethq-0.6.1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare test
-DEPEND=sys-libs/ncurses:0=
+DEPEND=sys-libs/ncurses:=
 DESCRIPTION=Ethernet NIC Queue stats viewer
 EAPI=7
 HOMEPAGE=https://github.com/isc-projects/ethq
@@ -8,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=sys-libs/ncurses:0=
+RDEPEND=sys-libs/ncurses:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/isc-projects/ethq/archive/v0_6_1.tar.gz -> ethq-0_6_1.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=aef54ba74d168af1971b04b1f143d6f3
+_md5_=5b427c8212858b6f88a65600e6bd024b
diff --git a/metadata/md5-cache/sys-apps/ethq-9999 b/metadata/md5-cache/sys-apps/ethq-9999
index fb6933a386bc..c73f81b65044 100644
--- a/metadata/md5-cache/sys-apps/ethq-9999
+++ b/metadata/md5-cache/sys-apps/ethq-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=sys-libs/ncurses:0=
+DEPEND=sys-libs/ncurses:=
 DESCRIPTION=Ethernet NIC Queue stats viewer
 EAPI=7
 HOMEPAGE=https://github.com/isc-projects/ethq
@@ -8,8 +8,8 @@ INHERIT=git-r3 toolchain-funcs
 IUSE=test
 LICENSE=MPL-2.0
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0=
+RDEPEND=sys-libs/ncurses:=
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1955523de4b062d8e7ab7d863d74395f
+_md5_=5a1a16e23fec3272a831cd30c07e81b2
diff --git a/metadata/md5-cache/sys-apps/file-5.42 b/metadata/md5-cache/sys-apps/file-5.42
new file mode 100644
index 000000000000..d973c20b89ed
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.42
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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(-)?] ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Identify a file's format by scanning binary data for patterns
+EAPI=7
+HOMEPAGE=https://www.darwinsys.com/file/
+INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal verify-sig
+IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[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=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.42.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.42.tar.gz.asc )
+_eclasses_=distutils-r1	197b6711aac35c87e9536c55ad3b909d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=78820a2336b8dd160f339321cfc2bac6
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 3fd47fb182ef..014e54f71c25 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -1,7 +1,7 @@
 BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.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(-)?] ) >=app-portage/elt-patches-20170815 sys-devel/gnuconfig || ( >=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=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=identify a file's format by scanning binary data for patterns
+DESCRIPTION=Identify a file's format by scanning binary data for patterns
 EAPI=7
 HOMEPAGE=https://www.darwinsys.com/file/
 INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal autotools git-r3
@@ -12,4 +12,4 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	197b6711aac35c87e9536c55ad3b909d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5d5b86ce8cb2caff422372bc299d2340
+_md5_=2ab2617d7d06ad918ca1d71316c72503
diff --git a/metadata/md5-cache/sys-apps/fwts-20.11.00 b/metadata/md5-cache/sys-apps/fwts-20.11.00
deleted file mode 100644
index 9dda6de44d27..000000000000
--- a/metadata/md5-cache/sys-apps/fwts-20.11.00
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libbsd dev-libs/libpcre sys-apps/dmidecode sys-apps/dtc sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-devel/libtool
-DESCRIPTION=Firmware Test Suite
-EAPI=7
-HOMEPAGE=https://wiki.ubuntu.com/Kernel/Reference/fwts
-INHERIT=autotools
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libbsd dev-libs/libpcre sys-apps/dmidecode sys-apps/dtc sys-apps/pciutils sys-power/iasl sys-power/pmtools
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/fwts_20.11.00.orig.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5e668622aedbc2542431f9475c93de0b
diff --git a/metadata/md5-cache/sys-apps/minijail-12 b/metadata/md5-cache/sys-apps/minijail-12
deleted file mode 100644
index ca772d9b6abd..000000000000
--- a/metadata/md5-cache/sys-apps/minijail-12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=sys-libs/libcap-ng:= test? ( virtual/pkgconfig >=dev-cpp/gtest-1.8.0:= )
-DESCRIPTION=helper binary and library for sandboxing & restricting privs of service
-EAPI=7
-HOMEPAGE=https://android.googlesource.com/platform/external/minijail
-INHERIT=linux-info toolchain-funcs
-IUSE=+seccomp test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/libcap-ng:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/minijail/archive/linux-v12.tar.gz -> minijail-12.tar.gz
-_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=187193167638af5f47f8d7cf6c3db5b9
diff --git a/metadata/md5-cache/sys-apps/minijail-17 b/metadata/md5-cache/sys-apps/minijail-17
index 119276c5c34f..02fa2e231af2 100644
--- a/metadata/md5-cache/sys-apps/minijail-17
+++ b/metadata/md5-cache/sys-apps/minijail-17
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/minijail/archive/linux-v17.tar.gz -> minijail-17.tar.gz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=187193167638af5f47f8d7cf6c3db5b9
+_md5_=e7c4b7462586c20dd73c8eeb02b446ef
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 04c0f3d8b3bd..5c0e39329c30 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220610 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220610
new file mode 100644
index 000000000000..2177e6af6be1
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220610
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) 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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) 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? ( test )
+SLOT=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220610/gcc-11-20220610.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	2f9b5fb8de048ee74d9eb825714fc71d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6629110b910032790e6cc6a9bc558008
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index eed9b5c1b11d..0cd998f0fd7b 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.9 b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.9
new file mode 100644
index 000000000000..a2afffc8437a
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.9
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=>=sys-fs/fuse-3:=
+DESCRIPTION=FUSE implementation for overlayfs
+EAPI=7
+HOMEPAGE=https://github.com/containers/fuse-overlayfs
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=GPL-3
+RDEPEND=>=sys-fs/fuse-3:=
+SLOT=0
+SRC_URI=https://github.com/containers/fuse-overlayfs/archive/v1.9.tar.gz -> fuse-overlayfs-1.9.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=63947414faa909c54e1f6823d7018739
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index cf98e8cc3e90..e8f0947f514b 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.9.4 b/metadata/md5-cache/sys-kernel/kpatch-0.9.4
index f9a4bd0e4460..f4d408865825 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.9.4
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.9.4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.9.4.tar.gz -> kpatch-0.9.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97309f7c6e81600f295ea717ba971ab5
+_md5_=5c8ea600d4b14d04025597338c550438
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 6bbfb3cbb26b..80b3ecf95d86 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/element-1.10.14 b/metadata/md5-cache/www-apps/element-1.10.14
new file mode 100644
index 000000000000..ffe7f2ef4f87
--- /dev/null
+++ b/metadata/md5-cache/www-apps/element-1.10.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=A glossy Matrix collaboration client for the web
+EAPI=8
+HOMEPAGE=https://element.io/
+INHERIT=webapp
+IUSE=vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-admin/webapp-config
+SLOT=1.10.14
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.10.14/element-v1.10.14.tar.gz
+_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
+_md5_=c78809ecdea24af42e1a2503a5b9ed86
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index e6828a73504c..ab2e740a8c65 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/pound-3.0 b/metadata/md5-cache/www-servers/pound-3.0
index a3174782430c..e52d1865641d 100644
--- a/metadata/md5-cache/www-servers/pound-3.0
+++ b/metadata/md5-cache/www-servers/pound-3.0
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libpcre:= dev-libs/libyaml:= dev-libs/nanomsg:= dev-libs/openssl:= net-libs/mbedtls:=
+DEPEND=dev-libs/libpcre:= dev-libs/libyaml:= dev-libs/nanomsg:= dev-libs/openssl:= net-libs/mbedtls:= elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=A http/https reverse-proxy and load-balancer
 EAPI=7
 HOMEPAGE=https://www.apsis.ch/pound.html
 INHERIT=cmake
 KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=BSD GPL-3
-RDEPEND=dev-libs/libpcre:= dev-libs/libyaml:= dev-libs/nanomsg:= dev-libs/openssl:= net-libs/mbedtls:=
+RDEPEND=dev-libs/libpcre:= dev-libs/libyaml:= dev-libs/nanomsg:= dev-libs/openssl:= net-libs/mbedtls:= elibc_musl? ( sys-libs/queue-standalone )
 SLOT=0
 SRC_URI=https://www.apsis.ch/pound/Pound-3.0.tgz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4efd8ef96b5be5b414be69f4053b459f
+_md5_=b78125edef6b58891f4a7af7efacc471
diff --git a/metadata/md5-cache/www-servers/pound-3.0.2 b/metadata/md5-cache/www-servers/pound-3.0.2
new file mode 100644
index 000000000000..68bec3a6fc30
--- /dev/null
+++ b/metadata/md5-cache/www-servers/pound-3.0.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libpcre:= dev-libs/libyaml:= dev-libs/nanomsg:= dev-libs/openssl:= net-libs/mbedtls:= elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=A http/https reverse-proxy and load-balancer
+EAPI=8
+HOMEPAGE=https://www.apsis.ch/pound.html
+INHERIT=cmake
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=BSD GPL-3
+RDEPEND=dev-libs/libpcre:= dev-libs/libyaml:= dev-libs/nanomsg:= dev-libs/openssl:= net-libs/mbedtls:= elibc_musl? ( sys-libs/queue-standalone )
+SLOT=0
+SRC_URI=https://www.apsis.ch/pound/Pound-3.0.2.tgz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b28691f9c32ea4ff6e65700890b88f76
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 988294e7edef..e22d6ef4b4be 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r6 b/metadata/md5-cache/x11-misc/redshift-1.12-r6
index 68b01a7c2523..87533b945c5e 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.12-r6
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://jonls.dk/redshift/
 INHERIT=flag-o-matic systemd autotools xdg-utils python-r1
 IUSE=appindicator geoclue gtk nls python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 ~riscv x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) gtk? ( dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 REQUIRED_USE=gtk? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d6b8206d12d9f855ceeecbc2b2a14480
+_md5_=2ef2fea5f61ad7e2f075e6de5f38db87
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index f501e82e3394..0a538051a337 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmbattery-2.56 b/metadata/md5-cache/x11-plugins/wmbattery-2.56
new file mode 100644
index 000000000000..bfe8e296a93e
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmbattery-2.56
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=apm? ( sys-apps/apmd ) x11-libs/libX11 x11-libs/libXext x11-libs/libXpm upower? ( >=sys-power/upower-0.9.23 )
+DESCRIPTION=A dockable app to report APM, ACPI, or SPIC battery status
+EAPI=8
+HOMEPAGE=https://www.dockapps.net/wmbattery
+IUSE=apm +upower
+KEYWORDS=~amd64 ~ppc -sparc ~x86
+LICENSE=GPL-2
+RDEPEND=apm? ( sys-apps/apmd ) x11-libs/libX11 x11-libs/libXext x11-libs/libXpm upower? ( >=sys-power/upower-0.9.23 )
+SLOT=0
+SRC_URI=https://www.dockapps.net/download/wmbattery-2.56.tar.gz
+_md5_=d8f07beaa2c4d5197fd05490f5153bf2
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 20338ccbf799..fb34aed435a8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Jun 2022 18:09:31 +0000
+Sat, 11 Jun 2022 08:39:31 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 01b73f8bfc9f..d26a6eb1d89f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun 10 06:09:31 PM UTC 2022
+Sat Jun 11 08:39:31 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2fc21bde90e8..142987751f6e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Jun 2022 18:30:01 +0000
+Sat, 11 Jun 2022 09:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index dc4657c3a698..2795581c4545 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ae969280c9a42b5a2208cbb2f5a97d82beb6bffe 1654884004 2022-06-10T18:00:04+00:00
+d16f359e0624cc2e158d489144550fc3970fdd90 1654933246 2022-06-11T07:40:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b52f894367ef..623a36ec6615 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1654884601 Fri 10 Jun 2022 06:10:01 PM UTC
+1654936801 Sat 11 Jun 2022 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 20338ccbf799..fb34aed435a8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Jun 2022 18:09:31 +0000
+Sat, 11 Jun 2022 08:39:31 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 30da12395d88..4aa6ae932b6d 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 9ae92252a68e..ee26be27fc03 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -3,3 +3,4 @@ DIST netdata-1.33.0.tar.gz 22470692 BLAKE2B fc0feed8a93876ca7ec304d8ff95312de19f
 DIST netdata-1.33.1.tar.gz 22611080 BLAKE2B 01838efcfc99ce644f04af1cde3dcbc5844cf2eaff8afb44503effd017b4dcd9ed990cd2ad6f285f81c72a0bae91586fa21c0306ad932252503ee755b949d7e3 SHA512 f6586426bd0fe1ac3d903ec279b27177b1d232f5ca1fc28b01f052a5f2f57846d2d6369c9d5a1872fb97e31f86f1f7a11c600beda590447f9ca30c93e7ac262c
 DIST netdata-1.34.1.tar.gz 22356370 BLAKE2B d166b121e567c9cd0e7929326a5c5049af953f396e7bc38f86b06a83bca9bb823fb4842585d87e237596fec9fe091e50fade2a3cf17e6426de33cbfecc2c92dd SHA512 777b0f4efa0b64dd150a097cb2ec1c3155506ada9c1e5289b6acda5e34c9262f796795608b52e70c9310a5cbda03c0568e1391c6861c7f3ea84aa9ca84ed9a0c
 DIST netdata-1.35.0.tar.gz 22335392 BLAKE2B d3f1bc5e0c2bfd59be47fd479caa7b262bf266c9a2c52889c42ea51151ab454346c97a73562789d1807d78a9446bf9b7073e210a016b4087f0178ca825f2471d SHA512 a2400044a80ce7d9e93d9c0f31621c572cbb77079933afaea1beca5f00b10139b1dcb2442f07f113a9eda9b0794ea3a494abde42a0acf062f91fd0460a32f4ff
+DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3516f7ff2a6fda77829433398986bc564b377362097ea7c2595ac01911a817be124c9f0ba560dd00ae5001a080da7 SHA512 43cbf099841fe2547b7de56610f811e55fdf2e9af3dc18fde818e09de1125a7f8d57f6a16f2dee8ea4b9e6f2683959549810a1ea7f8f7b5007eb7069bfddb477
diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild
new file mode 100644
index 000000000000..3df5ef6ecd47
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.35.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	cloud? ( dev-libs/protobuf:= )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc64; then
+		# bundled dlib does not support vsx on big-endian
+		# https://github.com/davisking/dlib/issues/397
+		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--without-bundled-protobuf \
+		$(use_enable cloud) \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis exporting-kinesis) \
+		$(use_enable lto lto) \
+		$(use_enable mongodb exporting-mongodb) \
+		$(use_enable prometheus exporting-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_compile() {
+	emake clean
+	default
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 366f0e46e257..93077661ffc0 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 9c312f87501d..0114b1e4c4fd 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -2,3 +2,4 @@ DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2
 DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4f6e395e8da0fe65274e32ebeed07e3c9b1869029e6ffbc655cfa41d5de2a1dcba54acee33a7a10d28bfbfce791b7ccd0fc57a SHA512 513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312
 DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
 DIST freeradius-server-3.0.22.tar.gz 5248422 BLAKE2B b48170a02a354562dc2dd27230476d2ce0823fa2f577dde3f3947ee14653d912a562eb480c2d2ed53b0ff536f63ce4482b24f2777b4a41ff2ed4aba88f4c196e SHA512 8ee05350b1a5e811a51030a3ef0c511c58275407171f0ce41775e3695f3e9a4477e2fc288541015d314be5457154201d4e95f4c45cf7f503bc8829909c2551a8
+DIST freeradius-server-3.2.0.tar.bz2 3399380 BLAKE2B 103cb1faf7efd78520dd613da51671ff37b870fcd356d7d11454d655cf460bcb4132cd91b99be70557242907dd5e4d741b6a776de81c37a24ab9d04a4fe5866b SHA512 e7aa7bfc5a6968cdb860bb565ebd45bc1b3f78a665a9888a8b8dacaa1c5256755468aed33bdffe39465f8678c1fb9d6f47f0dbcf0178dfdcb38d99e3bc4b747d
diff --git a/net-dialup/freeradius/freeradius-3.2.0.ebuild b/net-dialup/freeradius/freeradius-3.2.0.ebuild
new file mode 100644
index 000000000000..8bc300f849ea
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.2.0.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools pam python-single-r1 systemd
+
+MY_PN=${PN}-server
+MY_P=${MY_PN}-${PV}
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/"
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	postgres python readline redis samba sqlite ssl systemd
+"
+
+RESTRICT="firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+
+# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
+# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
+
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-libs/libltdl
+	dev-libs/libpcre
+	dev-libs/json-c:=
+	dev-lang/perl:=
+	net-libs/libpcap
+	sys-libs/gdbm:=
+	sys-libs/libcap
+	sys-libs/talloc
+	virtual/libcrypt:=
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	redis? ( dev-libs/hiredis:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# bug #721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+	# TODO: shift more of these into configure args below as things
+	# are a bit better now.
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+
+	# Drop support for python2
+	rm -r src/modules/rlm_python || die
+
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	#use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# These are all things we don't have in portage/I don't want to deal
+	# with myself.
+	#
+	# Requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
+	# Requires libeap-ikev2
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
+	# Requires some membership.h
+	rm -r src/modules/rlm_opendirectory || die
+	# ?
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# SQL drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag} ; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# - Verbosity
+	# - B uild shared libraries using jlibtool -shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		Make.inc.in || die
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		scripts/libtool.mk || die
+
+	# Crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# Do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		# Revisit confcache when not needing to use ac_cv anymore
+		# for automagic deps.
+		#--cache-file="${S}"/config.cache
+
+		--enable-shared
+		--disable-ltdl-install
+		--disable-silent-rules
+		--with-system-libtool
+		--with-system-libltdl
+
+		--enable-strict-dependencies
+		--without-rlm_couchbase
+		--without-rlm_securid
+		--without-rlm_unbound
+		--without-rlm_idn
+		#--without-rlm_json
+		#$(use_with rest libfreeradius-json)
+
+		# Our OpenSSL should be patched. Avoid false-positive failures.
+		--disable-openssl-version-check
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-pcre
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+
+	# bug #77613
+	if has_version app-crypt/heimdal ; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	if ! use readline ; then
+		export ac_cv_lib_readline=no
+	fi
+
+	#if ! use pcap ; then
+	#	export ac_cv_lib_pcap_pcap_open_live=no
+	#	export ac_cv_header_pcap_h=no
+	#fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# - Verbose, do not install certificates
+	# - Parallel install fails (bug #509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam ; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# bug #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}"/usr/sbin/rc.radiusd || die
+
+	newinitd "${FILESDIR}"/radius.init-r4 radiusd
+	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl ; then
+		cd "${ROOT}"/etc/raddb/certs || die
+
+		./bootstrap || die "Error while running ./bootstrap script."
+		chown root:radius "${ROOT}"/etc/raddb/certs || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3f17c03727d3..c7d2b6beee10 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 8c93d2fe69e3..a5cf62919db7 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1 +1,2 @@
 DIST prosody-0.12.0.tar.gz 610330 BLAKE2B 14694ee95dc6eb6d053278a9d7718fd7487fe7ef862b4e2ee0d57f2b60cdeb22d1c74eac4a4df7447ea3e9ff57fb3734a9c9997f2767ed3aa04682f265b82185 SHA512 b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce
+DIST prosody-0.12.1.tar.gz 611898 BLAKE2B 0b65ffbd6d4703f9e5fbac80e8887a4a41297afd22a776fb2eaa718b309f46c55a9d78f1d3ea97d4434c6ea2ebfe7a9051532ceda25ad78611769bd031894084 SHA512 705d2bcd38ffb19e90dab19992711aebf3d81f7bca7f9791ae5149510d465ec837ddf26a8c547eff2f2d131e5a694ddc3d0aac0b8921df65808192ae00527a85
diff --git a/net-im/prosody/prosody-0.12.1.ebuild b/net-im/prosody/prosody-0.12.1.ebuild
new file mode 100644
index 000000000000..e9cab9fb7d64
--- /dev/null
+++ b/net-im/prosody/prosody-0.12.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit lua-single systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib"
+REQUIRED_USE="
+	^^ ( icu idn )
+	${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/prosody
+	acct-user/prosody
+	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
+	dev-lua/luarocks[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/lua-unbound[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/readline[${LUA_USEDEP}]')
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	ldap? ( $(lua_gen_cond_dep 'dev-lua/lualdap[${LUA_USEDEP}]') )
+	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
+	dev-libs/openssl:0=
+	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
+	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
+	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
+	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
+	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
+	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
+	${LUA_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.12.0-gentoo.patch" )
+
+src_prepare() {
+	default
+
+	# Set correct plugin path for optional net-im/prosody-modules package
+	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--add-cflags="${CFLAGS}"
+		--add-ldflags="${LDFLAGS}"
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/lib/prosody"
+		--idn-library="$(usex idn 'idn' 'icu')"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
+		--no-example-certs
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="${ELUA}"
+		--sysconfdir="${EPREFIX}/etc/prosody"
+		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
+		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/prosody
+
+	newinitd "${FILESDIR}"/prosody.initd-r6 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r3 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r2 prosody.conf
+}
+
+pkg_postinst() {
+	local migrate_to_prosody_user="false"
+	tmpfiles_process prosody.conf
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 0.12.0; then
+				migrate_to_prosody_user="true"
+				break
+			fi
+		done
+	fi
+
+	# Sarting with >=0.12.0, the prosody configuration is now in
+	# /etc/prosody and no longer in /etc/jabber.
+	# See if we need to migrate the configuration. Furthermore,
+	# prosody no longer runs under the, shared via net-im/jabber-base,
+	# 'jabber' use, but under its own user.
+	# This increase isolation and hence robustness and security.
+	if ${migrate_to_prosody_user}; then
+		local -A dirs_to_migrate=(
+			[/etc/jabber]=/etc/prosody
+			[/var/log/jabber]=/var/log/prosody
+			[/var/spool/jabber]=/var/lib/prosody
+		)
+
+		for src_dir in "${!dirs_to_migrate[@]}"; do
+			local eroot_src_dir="${EROOT}/${src_dir}"
+			local eroot_dst_dir="${EROOT}/${dirs_to_migrate[${src_dir}]}"
+
+			cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+			if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
+				rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+			fi
+
+			if ! use prefix; then
+				chown --recursive prosody:prosody "${eroot_dst_dir}" || die
+			fi
+		done
+
+		# Update configuration file to match new pathes and permissions
+		local mysedargs=(
+			-e "'s#/etc/jabber#/etc/prosody#g'"
+			-e "'s#/run/jabber#/run/prosody#g'"
+			-e "'s#/var/log/jabber#/var/log/prosody#g'"
+			-e "'s/prosody_user.*/prosody_user = \"prosody\";/g'"
+			-e "'s/prosody_group.*/prosody_group = \"prosody\";/g'"
+			-i /etc/prosody/prosody.cfg.lua
+		)
+
+		eval sed "${mysedargs[@]}" || die
+
+		ewarn "Newer versions of the prosody (Gentoo) package use ${EROOT}/etc/prosody"
+		ewarn "(just as upstream) and *not* anymore ${EROOT}/etc/jabber."
+		ewarn "The files from ${EROOT}/etc/jabber where copied to ${EROOT}/etc/prosody."
+		ewarn "Also prosody's spool directory became ${EROOT}/var/lib/prosody (was ${EROOT}/var/spool/jabbber)."
+		ewarn "Please check your configuration."
+	fi
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index b6035ac39d44..d0facf35c0ad 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest
index 0a034dd5d20f..ad6ab550dc40 100644
--- a/net-libs/librouteros/Manifest
+++ b/net-libs/librouteros/Manifest
@@ -1 +1,2 @@
 DIST librouteros-1.1.2.tar.bz2 234942 BLAKE2B e5fbb28957280798539d81fd908d9198084dbc3f15e403c7d21a3be7b0211bb2e0cc387b3e237c530454396df430dd2781d2c8184609cebd9cde906eac1288fd SHA512 b4974f84f23544276e426b94410107d24565060034423dabb49157ed2cbee8042d4d415f716fae50a757f24c87c0deab51435236a5bc1bcffe5fc888b7047fc3
+DIST librouteros-1.1.3.tar.gz 20319 BLAKE2B d7527508e671c38ba12edd924300d53b10763bf3769378df3f988a4242ab8c4604d71d6afa55e963477a04b18a6e2afdae0123072d0876b793b022857bfacf30 SHA512 ff477efdf206a7c6f062af8b8d5636b16fa9a9c5a73e49fb78df9de38346063af5bf43a2057bc0b910350c1554e9a4915c6ee5b91b3822ee5e664db8754a8126
diff --git a/net-libs/librouteros/librouteros-1.1.3.ebuild b/net-libs/librouteros/librouteros-1.1.3.ebuild
new file mode 100644
index 000000000000..663f240b6072
--- /dev/null
+++ b/net-libs/librouteros/librouteros-1.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
+HOMEPAGE="https://octo.github.io/librouteros/"
+SRC_URI="https://github.com/octo/${PN}/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's/-Werror//g' -i src/Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-libs/librouteros/metadata.xml b/net-libs/librouteros/metadata.xml
index 85e4ed814fa2..a3b996f6ac77 100644
--- a/net-libs/librouteros/metadata.xml
+++ b/net-libs/librouteros/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/octo/librouteros/issues</bugs-to>
+		<remote-id type="github">octo/librouteros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch b/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch
new file mode 100644
index 000000000000..6d7d7fd955a3
--- /dev/null
+++ b/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch
@@ -0,0 +1,73 @@
+https://bugs.gentoo.org/831339
+https://bugs.gentoo.org/846938
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,5 +1,5 @@
+ 
+-LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Werror -Wall) -fPIC
++LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Wall) -fPIC
+ 
+ LIB_DIR = .
+ include defines.mk
+--- a/lib/common.mk
++++ b/lib/common.mk
+@@ -113,7 +113,6 @@ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK)
+ 	    -Wno-unused-value \
+ 	    -Wno-pointer-sign \
+ 	    -Wno-compare-distinct-pointer-types \
+-	    -Werror \
+ 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
+ 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
+ 
+--- a/lib/defines.mk
++++ b/lib/defines.mk
+@@ -39,7 +39,7 @@ endif
+ 
+ DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+-CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES)
++CFLAGS += -std=gnu11 -Wextra $(DEFINES)
+ BPF_CFLAGS += $(DEFINES)
+ 
+ CONFIGMK := $(LIB_DIR)/../config.mk
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -19,7 +19,7 @@ MAN_OBJ := ${MAN_PAGE:.3=.man}
+ MAN_FILES := $(MAN_PAGE)
+ TEST_DIR := tests
+ TEST_FILE := $(TEST_DIR)/test-libxdp.sh
+-TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall -Werror $(LDFLAGS)
++TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall $(LDFLAGS)
+ TEST_LDLIBS := $(LDLIBS)
+ 
+ SHARED_CFLAGS += -fPIC -DSHARED
+@@ -144,7 +144,6 @@ $(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK)
+ 	    -Wno-unused-value \
+ 	    -Wno-pointer-sign \
+ 	    -Wno-compare-distinct-pointer-types \
+-	    -Werror \
+ 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
+ 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
+ 
+diff --git a/configure b/configure
+index 0a17eae..fd251b7 100755
+--- a/configure
++++ b/configure
+@@ -186,7 +186,7 @@ int main(int argc, char **argv) {
+     return 0;
+ }
+ EOF
+-    libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
++    libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
+     if [ "$?" -eq "0" ]; then
+         echo "HAVE_FEATURES+=${config_var}" >>"$CONFIG"
+         echo "yes"
+@@ -254,7 +254,7 @@ int main(int argc, char **argv) {
+ }
+ EOF
+ 
+-        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
++        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
+         if [ "$?" -eq "0" ]; then
+             echo "SYSTEM_LIBBPF:=y" >>$CONFIG
+             echo "LIBBPF_VERSION=$LIBBPF_VERSION" >>$CONFIG
diff --git a/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
index 0dd14f1dc39b..4077d16404d0 100644
--- a/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
@@ -25,6 +25,10 @@ QA_PREBUILT="usr/lib/bpf/*.o"
 
 MAKEOPTS+=" V=1"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.3-no-werror.patch
+)
+
 src_configure() {
 	export PRODUCTION=1
 	export DYNAMIC_LIBXDP=1
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 0d157db64327..4bba0785754d 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
index 3aa11efa4dd8..084598853945 100644
--- a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
@@ -31,6 +31,7 @@ src_configure() {
 	# --disable-db-as-registry
 	# --disable-db-cc-registry
 	local myeconfargs=(
+		--disable-compiler-warning-to-error
 		--disable-bundled-getopt
 		--disable-bundled-md5
 		--enable-shared
diff --git a/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch
new file mode 100644
index 000000000000..7e3357c8e361
--- /dev/null
+++ b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/832563
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ dnl Support "--enable-debug=..." configure script command line option.
+ AX_IS_RELEASE([git-directory])
+ AX_CHECK_ENABLE_DEBUG([yes])
+ 
+-AM_INIT_AUTOMAKE([1.15 -Wall -Werror -Wno-portability silent-rules std-options check-news])
++AM_INIT_AUTOMAKE([1.15 -Wall -Wno-portability silent-rules std-options check-news])
+ AM_SILENT_RULES([yes])
+ LT_INIT([disable-static])
+ 
+@@ -301,7 +301,7 @@ LIBS=$mptcpd_save_libs
+ # warning free.
+ # ---------------------------------------------------------------
+ AX_CFLAGS_WARN_ALL([CFLAGS])
+-AX_APPEND_COMPILE_FLAGS([-Wextra -Werror -pedantic])
++AX_APPEND_COMPILE_FLAGS([-Wextra -pedantic])
+ 
+ # ---------------------------------------------------------------
+ # Enable compile-time defense
diff --git a/net-misc/mptcpd/mptcpd-0.9.ebuild b/net-misc/mptcpd/mptcpd-0.9.ebuild
index a35610eb41ad..f678fe599d7a 100644
--- a/net-misc/mptcpd/mptcpd-0.9.ebuild
+++ b/net-misc/mptcpd/mptcpd-0.9.ebuild
@@ -41,9 +41,15 @@ fi
 
 CONFIG_CHECK="MPTCP"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9-no-werror.patch
+)
+
 src_prepare() {
 	default
-	[[ ${PV} == 9999* ]] && eautoreconf
+
+	# For Werror patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-misc/mptcpd/mptcpd-9999.ebuild b/net-misc/mptcpd/mptcpd-9999.ebuild
index 8f307676ab46..8265562c6a0c 100644
--- a/net-misc/mptcpd/mptcpd-9999.ebuild
+++ b/net-misc/mptcpd/mptcpd-9999.ebuild
@@ -40,7 +40,9 @@ CONFIG_CHECK="MPTCP"
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999* ]] && eautoreconf
+
+	# For Werror patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 769a83d27d25..1028d3e5aed9 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53bc3cce3a18..ed524909df2a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -55,11 +55,6 @@ net-libs/ngtcp2 openssl
 # Needs masked version of ogre (>=1.12), bug #825330
 >=dev-games/mygui-3.4.1 ogre
 
-# Sam James <sam@gentoo.org> (2022-02-21)
-# Needs build system love to make LLVM support work.
-# bug #745915
-sci-libs/symengine llvm
-
 # Marek Szuba <marecki@gentoo.org> (2022-02-07)
 # Deprecated back-end with known stability and data-corruption issues,
 # likely to be removed in gramps-5.2.0.
diff --git a/profiles/base/package.use.stable.force b/profiles/base/package.use.stable.force
index 888ae45e9dd2..90c98d1e2a45 100644
--- a/profiles/base/package.use.stable.force
+++ b/profiles/base/package.use.stable.force
@@ -1,17 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.force
 
-# Sam James <sam@gentoo.org> (2021-10-26)
-# Force USE=daemon for now because current versions of PA ebuilds need
-# complicated package.use changes to satisfy REQUIRED_USE with -daemon
-# We want users to be able to benefit from the other PA 15 fixes, so
-# force this on for now, to be revisited once libpulse split is complete
-# in Gentoo. bug #820332
-media-sound/pulseaudio daemon
-
 ## Kent Fredric <kentnl@gentoo.org> (2019-07-11)
 # The absense of these features require dev-perl/GD, which currently
 # can't be considered stable due to serious defects upstream.
diff --git a/profiles/package.mask b/profiles/package.mask
index 5ef0ceb0c661..82865acc0b40 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -590,10 +590,7 @@ net-libs/libsoup:3.0
 # Masked while being tested and reverse deps aren't fully compatible
 # bug #797325.
 =dev-libs/openssl-3.0*
-
-# Craig Andrews <candrews@gentoo.org> (2021-09-20)
-# Requires OpenSSL >= 3.0.0
-# Masked until dev-libs/openssl-3.0* is unmasked
+=dev-libs/openssl-compat-1.1.1*
 =dev-libs/gost-engine-3.0*
 
 # Joonas Niilola <juippis@gentoo.org> (2021-07-29)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 572f78a56be4..4fe97590203e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2205,6 +2205,7 @@ dev-libs/openssl-compat:sslv2 - Support for the old/insecure SSLv2 protocol -- n
 dev-libs/openssl-compat:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https
 dev-libs/openssl-compat:tls-compression - Enable support for discouraged TLS compression
 dev-libs/openssl-compat:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
+dev-libs/openssl-compat:weak-ssl-ciphers - Build support for SSL/TLS ciphers that are considered "weak"
 dev-libs/pkcs11-helper:nss - Enable NSS crypto engine
 dev-libs/pocl:accel - Enable the generic hardware accelerator device driver
 dev-libs/pocl:cl20 - Enable reporting OpenCL 2.0 for the CPU device
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index c1831dee77af..6ad558ae1674 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 8232d5518f32..846d67b85759 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,2 +1,3 @@
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
+DIST netcdf-4.9.0.tar.gz 19491744 BLAKE2B b669f7ccb2f7a8def9d5b944a97d101ea7b7307d6e1495a97c0966b4ac9722b404d6039dee192da759d14d52259be2ff4f49be3bfb6cbbfac48732684cbff9c3 SHA512 62cb593b99a6e9c56426175d141907572d3974de8dc39549c85337acf410539f9b7dcd9a375808e271da1d0dc93fce7586b955eddd2bb45901d9cc48a72db705
diff --git a/sci-libs/netcdf/netcdf-4.9.0.ebuild b/sci-libs/netcdf/netcdf-4.9.0.ebuild
new file mode 100644
index 000000000000..8ffc629f18a2
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.9.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-c-${PV}
+
+LICENSE="UCAR-Unidata"
+# SONAME of libnetcdf.so
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libxml2
+	dap? ( net-misc/curl:= )
+	hdf? (
+		media-libs/libjpeg-turbo:=
+		sci-libs/hdf:=
+		sci-libs/hdf5:=
+	)
+	hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="
+	test? ( tools )
+	szip? ( hdf5 )
+	mpi? ( hdf5 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.4-big-endian-test.patch
+)
+
+src_configure() {
+	use mpi && export CC=mpicc
+
+	# Temporary workaround for test breakage
+	# https://github.com/Unidata/netcdf-c/issues/1983
+	# bug #827042
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DENABLE_DAP_REMOTE_TESTS=OFF
+		#-DENABLE_HDF4_FILE_TESTS=OFF
+		-DENABLE_LIBXML2=ON
+		-DBUILD_UTILITIES=$(usex tools)
+		-DENABLE_DAP=$(usex dap)
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_HDF4=$(usex hdf)
+		-DENABLE_NETCDF_4=$(usex hdf5)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Fails parallel tests: bug #621486
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	# bug #827188
+	sed -i -e "s:${EPREFIX}/usr/$(get_libdir)/libdl.so;:dl;:" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die
+}
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 1e5c3b5f71cb..9380fab848c4 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,4 +1,2 @@
-DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b
-DIST symengine-0.7.0.tar.gz 802307 BLAKE2B de207f565f179deae37479eec82dfced3d83bfb7e643b4e6969135e10130dd05c888f34aa75c76c238ff1babfd0864f3329c3deee126b84ec33c4937c11dc20c SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348
 DIST symengine-0.8.1.tar.gz 733007 BLAKE2B b218674bd4cc1eb5b5ebf7ec9d69093d3ab0d25c5fd302430457189ff56f44cb56640fab380a7415fdc241e9c7e3e1a4199ec8063a54b9358b35f0ab8076f05a SHA512 b83b354a722c589cf262fbfad902b277a7232ae2b949ff97f4ad8f654c44965f15eae7d78e87045a42dd6ee5f6f6f67af0a2c4def8899db430fc17e3360696a9
 DIST symengine-0.9.0.tar.gz 878574 BLAKE2B 32c37ca6575b3f7e37184c80c2df74ebf7bb7846537e951be6c888994b8dc049c1ed2a6f51da1c1cfb038e0a47393b18acff60cfef665c5a5e714beb9b0ecb12 SHA512 dceca49ddb6e2ac7c4f8ecb73ce19824cbaa3eff41ad0f50008e403498121184b4e9dc660628dbd8e4db979f8c16b83a709a40540f7834954ab01f9854e12caa
diff --git a/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
new file mode 100644
index 000000000000..810e2ac766d7
--- /dev/null
+++ b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
@@ -0,0 +1,68 @@
+From: Matthias Maier <tamiko@43-1.org>
+Date: Sat, 11 Jun 2022 01:44:54 -0500
+Subject: [PATCH] Fix cmake configure for shared LLVM libraries
+
+Gentoo builds LLVM into a combined shared library. The CMake
+configuration shipped with LLVM is evidently broken in this case, see
+
+  https://github.com/llvm/llvm-project/issues/34593
+  https://bugs.gentoo.org/745915
+
+We work around this issue by simply linking against the monolithic
+"LLVM" target.
+---
+ CMakeLists.txt | 23 +----------------------
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf5ab3b..dfa6605 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -402,28 +402,7 @@ if (WITH_LLVM)
+     endforeach()
+     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+ 
+-    llvm_map_components_to_libnames(llvm_libs_direct ${SYMENGINE_LLVM_COMPONENTS})
+-    llvm_expand_dependencies(llvm_libs ${llvm_libs_direct})
+-
+-    if (BUILD_SHARED_LIBS)
+-        set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT False)
+-        foreach(LLVM_LIB ${llvm_libs})
+-            get_target_property(${LLVM_LIB}_IMPORT_LOCATION ${LLVM_LIB} LOCATION)
+-            if (NOT "${${LLVM_LIB}_IMPORT_LOCATION}" MATCHES "NOTFOUND")
+-                if (NOT "${${LLVM_LIB}_IMPORT_LOCATION}" MATCHES ".a$|.lib$")
+-                    set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT True)
+-                endif()
+-            endif()
+-        endforeach()
+-    else()
+-        set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT True)
+-    endif()
+-    set(SYMENGINE_LLVM_LINK_DOWNSTREAM ${SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT}
+-        CACHE INTERNAL "Link to llvm in SymEngineConfig.cmake")
+-    if (NOT SYMENGINE_LLVM_LINK_DOWNSTREAM)
+-        unset(SYMENGINE_LLVM_COMPONENTS)
+-    endif ()
+-    set(LIBS ${LIBS} ${llvm_libs})
++    set(LIBS ${LIBS} LLVM)
+     include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
+     set(HAVE_SYMENGINE_LLVM yes)
+     set(PKGS ${PKGS} "LLVM")
+diff --git a/cmake/SymEngineConfig.cmake.in b/cmake/SymEngineConfig.cmake.in
+index b01ef9b..6d82c10 100644
+--- a/cmake/SymEngineConfig.cmake.in
++++ b/cmake/SymEngineConfig.cmake.in
+@@ -67,9 +67,7 @@ set(SYMENGINE_LLVM_COMPONENTS @SYMENGINE_LLVM_COMPONENTS@)
+ 
+ if (NOT "${SYMENGINE_LLVM_COMPONENTS}" STREQUAL "")
+     find_package(LLVM REQUIRED ${SYMENGINE_LLVM_COMPONENTS} HINTS @LLVM_DIR@)
+-    llvm_map_components_to_libnames(llvm_libs_direct ${SYMENGINE_LLVM_COMPONENTS})
+-    llvm_expand_dependencies(llvm_libs ${llvm_libs_direct})
+-    set(SYMENGINE_LIBRARIES ${SYMENGINE_LIBRARIES} ${llvm_libs})
++    set(SYMENGINE_LIBRARIES ${SYMENGINE_LIBRARIES} LLVM)
+ else()
+     set(SYMENGINE_LLVM_INCLUDE_DIRS)
+ endif()
+-- 
+2.35.1
+
diff --git a/sci-libs/symengine/symengine-0.6.0-r1.ebuild b/sci-libs/symengine/symengine-0.6.0-r1.ebuild
deleted file mode 100644
index 1abca70085d2..000000000000
--- a/sci-libs/symengine/symengine-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/sympy/symengine"
-SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	ecm? ( sci-mathematics/gmp-ecm )
-	flint? ( sci-mathematics/flint:= )
-	mpc? ( dev-libs/mpc:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha
-	local int_class
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-	local mycmakeargs=(
-		-DINTEGER_CLASS="${int_class}"
-		-DBUILD_BENCHMARKS="$(usex benchmarks)"
-		-DBUILD_DOXYGEN="$(usex doc)"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_ARB="$(usex arb)"
-		-DWITH_BFD="$(usex debug)"
-		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
-		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
-		-DWITH_FLINT="$(usex flint)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_MPFR="$(usex mpfr)"
-		-DWITH_MPC="$(usex mpc)"
-		-DWITH_LLVM="$(usex llvm)"
-		-DWITH_PTHREAD="$(usex threads)"
-		-DWITH_TCMALLOC="$(usex tcmalloc)"
-		-DWITH_ECM="$(usex ecm)"
-	)
-	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
-
-	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
-	cmake_src_configure
-}
diff --git a/sci-libs/symengine/symengine-0.7.0-r1.ebuild b/sci-libs/symengine/symengine-0.7.0-r1.ebuild
deleted file mode 100644
index 1ffb62e2d6eb..000000000000
--- a/sci-libs/symengine/symengine-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/sympy/symengine"
-SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	ecm? ( sci-mathematics/gmp-ecm )
-	flint? ( sci-mathematics/flint:= )
-	mpc? ( dev-libs/mpc:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
-	"${FILESDIR}/${PN}-0.7.0-boost-1.77.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha
-	local int_class
-
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-
-	local mycmakeargs=(
-		-DINTEGER_CLASS="${int_class}"
-		-DBUILD_BENCHMARKS="$(usex benchmarks)"
-		-DBUILD_DOXYGEN="$(usex doc)"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_ARB="$(usex arb)"
-		-DWITH_BFD="$(usex debug)"
-		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
-		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
-		-DWITH_FLINT="$(usex flint)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_MPFR="$(usex mpfr)"
-		-DWITH_MPC="$(usex mpc)"
-		-DWITH_LLVM="$(usex llvm)"
-		-DWITH_PTHREAD="$(usex threads)"
-		-DWITH_TCMALLOC="$(usex tcmalloc)"
-		-DWITH_ECM="$(usex ecm)"
-	)
-	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
-
-	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
-	cmake_src_configure
-}
diff --git a/sci-libs/symengine/symengine-0.8.1-r1.ebuild b/sci-libs/symengine/symengine-0.8.1-r2.ebuild
similarity index 96%
rename from sci-libs/symengine/symengine-0.8.1-r1.ebuild
rename to sci-libs/symengine/symengine-0.8.1-r2.ebuild
index c389bae57034..93bc13fbc646 100644
--- a/sci-libs/symengine/symengine-0.8.1-r1.ebuild
+++ b/sci-libs/symengine/symengine-0.8.1-r2.ebuild
@@ -30,7 +30,8 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
+	"${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch
+	"${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch
 )
 
 pkg_pretend() {
diff --git a/sci-libs/symengine/symengine-0.9.0-r1.ebuild b/sci-libs/symengine/symengine-0.9.0-r2.ebuild
similarity index 95%
rename from sci-libs/symengine/symengine-0.9.0-r1.ebuild
rename to sci-libs/symengine/symengine-0.9.0-r2.ebuild
index d0cb975cca8a..52ecab72e67c 100644
--- a/sci-libs/symengine/symengine-0.9.0-r1.ebuild
+++ b/sci-libs/symengine/symengine-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 # BUILD_FOR_DISTRIBUTION enables threads by default so do it here
 IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads"
 RESTRICT="!test? ( test )"
@@ -32,6 +32,7 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch
+	"${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch
 	"${FILESDIR}"/${PN}-0.9.0-pthread-cmake.patch
 )
 
diff --git a/sci-libs/symengine/symengine-0.9.0.ebuild b/sci-libs/symengine/symengine-0.9.0.ebuild
deleted file mode 100644
index 98e672759860..000000000000
--- a/sci-libs/symengine/symengine-0.9.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=13
-inherit cmake llvm toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/symengine/symengine"
-SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-# BUILD_FOR_DISTRIBUTION enables threads by default so do it here
-IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	ecm? ( sci-mathematics/gmp-ecm )
-	flint? ( sci-mathematics/flint:= )
-	mpc? ( dev-libs/mpc:= )
-	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
-	tcmalloc? ( dev-util/google-perftools )"
-DEPEND="${RDEPEND}
-	dev-libs/cereal"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
-	"${FILESDIR}"/symengine-0.9.0-pthread-cmake.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	use llvm && llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha
-	local int_class
-
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-
-	einfo "Building with integer class: ${int_class}"
-
-	local mycmakeargs=(
-		-DINTEGER_CLASS=${int_class}
-		-DBUILD_BENCHMARKS=$(usex benchmarks)
-		-DBUILD_DOXYGEN=$(usex doc)
-		-DBUILD_TESTS=$(usex test)
-		-DWITH_ARB=$(usex arb)
-		-DWITH_BFD=$(usex debug)
-		-DWITH_SYMENGINE_ASSERT=$(usex debug)
-		-DWITH_SYMENGINE_THREAD_SAFE=$(usex threads)
-		-DWITH_FLINT=$(usex flint)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_MPFR=$(usex mpfr)
-		-DWITH_MPC=$(usex mpc)
-		-DWITH_LLVM=$(usex llvm)
-		-DWITH_PTHREAD=$(usex threads)
-		-DWITH_TCMALLOC=$(usex tcmalloc)
-		-DWITH_ECM=$(usex ecm)
-		-DWITH_SYSTEM_CEREAL=ON
-	)
-
-	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${ESYSROOT}"/usr/include )
-
-	cmake_src_configure
-}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 2cfcef42e2ae..226c1cb80d51 100644
Binary files a/sec-keys/Manifest.gz and b/sec-keys/Manifest.gz differ
diff --git a/sec-keys/openpgp-keys-file/Manifest b/sec-keys/openpgp-keys-file/Manifest
new file mode 100644
index 000000000000..0c2bf79d733a
--- /dev/null
+++ b/sec-keys/openpgp-keys-file/Manifest
@@ -0,0 +1 @@
+DIST openpgp-keys-file-20220611-BE04995BA8F90ED0C0C176C471112AB16CB33B3A.asc 2590 BLAKE2B 61296a3f1c626d4e579c74256bcdfd5b0a72f9c39770c97a37757b9633044a5253e7f4740cb1ed0f033730393758f5838f643f38dccdaae368235901ad0dba89 SHA512 cf5ef2be4d26fccb2b59d21aea57eb0f329661e6ed18d52b12b84ceba71994586db03292ff3cfbc70151d962db69cd5c8a62b0ff9485fc64745ff24ea7f315e9
diff --git a/sec-keys/openpgp-keys-file/metadata.xml b/sec-keys/openpgp-keys-file/metadata.xml
new file mode 100644
index 000000000000..b0d83aa2e489
--- /dev/null
+++ b/sec-keys/openpgp-keys-file/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-file/openpgp-keys-file-20220611.ebuild b/sec-keys/openpgp-keys-file/openpgp-keys-file-20220611.ebuild
new file mode 100644
index 000000000000..b4e7f8c63593
--- /dev/null
+++ b/sec-keys/openpgp-keys-file/openpgp-keys-file-20220611.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used by Christos Zoulas (to sign file releases)"
+# See e.g. https://github.com/file/file#gpg-for-dummies
+HOMEPAGE="https://www.darwinsys.com/file/"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-BE04995BA8F90ED0C0C176C471112AB16CB33B3A.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - file.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 25c99dedb2eb..1db34b55a709 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/dchroot/dchroot-0.12.1.ebuild b/sys-apps/dchroot/dchroot-0.12.1.ebuild
index eee10e8bef06..7f02674ae0ae 100644
--- a/sys-apps/dchroot/dchroot-0.12.1.ebuild
+++ b/sys-apps/dchroot/dchroot-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,13 +17,18 @@ IUSE=""
 DEPEND="sys-apps/help2man"
 RDEPEND="!dev-util/schroot[dchroot]"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.1-no-werror.patch
+)
+
 src_prepare() {
-	default
 	sed -i \
 		-e '/^all:/s:$: docs:' \
 		-e '/^CFLAGS/s:-O2:@CFLAGS@:' \
 		-e '/@CFLAGS@/ s:@CFLAGS@:@CFLAGS@ @LDFLAGS@:' \
 		Makefile.in || die "sed failed"
+
+	default
 }
 
 src_compile() {
diff --git a/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch b/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
new file mode 100644
index 000000000000..4cd270190456
--- /dev/null
+++ b/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/824542
+https://bugs.gentoo.org/722920
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,7 @@ mandir = ${prefix}/share/man
+ sysconfdir = $(DESTDIR)/etc
+ 
+ INSTALL=install
+-CFLAGS=-Wl,-z,now @CFLAGS@ @LDFLAGS@ -Wall -Wstrict-prototypes -Werror -g \
++CFLAGS=-Wl,-z,now @CFLAGS@ @LDFLAGS@ -Wall -Wstrict-prototypes \
+ 	-DDCHROOT_VERSION="\"@DCHROOT_VERSION@\""
+ 
+ all: dchroot docs
diff --git a/sys-apps/ethq/ethq-0.6.1.ebuild b/sys-apps/ethq/ethq-0.6.1.ebuild
index 6749cb3094e6..172f1ef054f7 100644
--- a/sys-apps/ethq/ethq-0.6.1.ebuild
+++ b/sys-apps/ethq/ethq-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,17 +18,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/ncurses:0="
+DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
 
-	# Respect FLAGS
-	sed -i -e '/CXXFLAGS/s/= -O3/+=/' \
+	# Respect FLAGS, remove Werror
+	sed -i  -e '/CXXFLAGS/s/= -O3/+=/' \
+		-e '/CXXFLAGS/s/ -Werror//' \
 		-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
 
 	if ! use test ; then
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index 76ff4fd29c74..11b6f2389400 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,17 +17,16 @@ KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/ncurses:0="
+DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
 
-	# Respect FLAGS
-	sed -i \
-		-e '/CXXFLAGS/s/= -O3/+=/' \
-		-e 's/ -Werror//' \
+	# Respect FLAGS, remove Werror
+	sed -i  -e '/CXXFLAGS/s/= -O3/+=/' \
+		-e '/CXXFLAGS/s/ -Werror//' \
 		-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
 
 	if ! use test ; then
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 8ae92ee49bed..39e70ed0adab 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1 +1,3 @@
 DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
+DIST file-5.42.tar.gz 1105846 BLAKE2B c557facb066ae0599db832ddbbc3fed7db2e057faefe832cb4bed8f860b63456217bee39f0c82b17902c3b91426e522681216d2d3ed689501fa00d69a4a09832 SHA512 33c3c339a561c6cf787cc06a16444a971c62068b01827612c948207a9714107b617bed8148cd67e6280cb1c62ad4dfb1205fb8486ea9c042ce7e19b067d3bb05
+DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1dda7d2b0e3228abdc0c1e21473a012b9799dcac8638ded1bdbe03865c5e41ed4086076a7df6bf6aadbfe29d SHA512 a7105c48f6c671638f5fb7f18f9b193d108456655b4c734208e00aca36fab54dd330ec2fdc3ff29fb78adbc16874af4fb0916c560e50228f82003a8cd258491a
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
new file mode 100644
index 000000000000..0b9cc3af8dba
--- /dev/null
+++ b/sys-apps/file/file-5.42.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
+	inherit verify-sig
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
+fi
+
+DESCRIPTION="Identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND+="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+	)"
+
+PATCHES=(
+	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	# don't let python README kill main README, bug ##60043
+	mv python/README.md python/README.python.md || die
+	# bug #662090
+	sed 's@README.md@README.python.md@' -i python/setup.py || die
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+
+	econf_build "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions, bug #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE="${S}"
+
+	if need_build_file ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		# bug #586444
+		emake -C src magic.h
+		emake -C src libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file ; then
+		# bug #586444
+		emake -C "${WORKDIR}"/build/src magic.h
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT # README
+
+	# Required for `file -C`
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index dbb7e47df16d..7f27cf37781f 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -9,15 +9,21 @@ PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/glensc/file.git"
 	inherit autotools git-r3
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
+	inherit verify-sig
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
 
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
+DESCRIPTION="Identify a file's format by scanning binary data for patterns"
 HOMEPAGE="https://www.darwinsys.com/file/"
 
 LICENSE="BSD-2"
@@ -36,7 +42,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	python? ( !dev-python/python-magic )
 	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND="
+BDEPEND+="
 	python? (
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
@@ -51,13 +57,14 @@ src_prepare() {
 
 	if [[ ${PV} == 9999 ]] ; then
 		eautoreconf
+	else
+		elibtoolize
 	fi
 
-	elibtoolize
-
-	# don't let python README kill main README #60043
+	# don't let python README kill main README, bug ##60043
 	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+	# bug #662090
+	sed 's@README.md@README.python.md@' -i python/setup.py || die
 }
 
 multilib_src_configure() {
@@ -80,13 +87,14 @@ build_src_configure() {
 		--disable-xzlib
 		--disable-zlib
 	)
+
 	econf_build "${myeconfargs[@]}"
 }
 
 need_build_file() {
 	# when cross-compiling, we need to build up our own file
 	# because people often don't keep matching host/target
-	# file versions #362941
+	# file versions, bug #362941
 	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
 }
 
@@ -106,18 +114,20 @@ multilib_src_compile() {
 	if multilib_is_native_abi ; then
 		emake
 	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
+		# bug #586444
+		emake -C src magic.h
+		emake -C src libmagic.la
 	fi
 }
 
 src_compile() {
 	if need_build_file ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
+		# bug #586444
+		emake -C "${WORKDIR}"/build/src magic.h
 		emake -C "${WORKDIR}"/build/src file
 		local -x PATH="${WORKDIR}/build/src:${PATH}"
 	fi
+
 	multilib-minimal_src_compile
 
 	if use python ; then
@@ -145,5 +155,6 @@ multilib_src_install_all() {
 		cd python || die
 		distutils-r1_src_install
 	fi
+
 	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index b330c0790e85..917680514886 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,2 +1 @@
-DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55
 DIST fwts_22.03.00.orig.tar.gz 3900335 BLAKE2B 2e36392f69140b1a2d3b77cc8d57740f66ea016063644916e69bb738e20191a780a9d2ed275cfd8b871ad8c3455f96c8ae26ab7c1574c0cc8efdbbb20f4cc785 SHA512 88f183293da4f6ebc1cefc382c9b5e1b378ac7d03e0c577937db89be9e8417e0ffdf0952cdffda57ac21787c3fe02c5254ec7ce61e100e78555ffa92d6a30dc2
diff --git a/sys-apps/fwts/fwts-20.11.00.ebuild b/sys-apps/fwts/fwts-20.11.00.ebuild
deleted file mode 100644
index 0d5da91d7a1c..000000000000
--- a/sys-apps/fwts/fwts-20.11.00.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/json-c-0.10-r1
-	dev-libs/libbsd
-	dev-libs/libpcre
-	sys-apps/dmidecode
-	sys-apps/dtc
-	sys-apps/pciutils
-	sys-power/iasl
-	sys-power/pmtools
-	"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
-	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
-	# Fix json-c includes
-	sed -e 's/^#include <json\//#include <json-c\//g' -i \
-		configure.ac || die
-	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
-		-i src/lib/include/fwts_json.h \
-		src/utilities/kernelscan.c || die
-	sed -e 's/-ljson/-ljson-c/'\
-		-i src/Makefile.am\
-		src/lib/src/Makefile.am\
-		src/utilities/Makefile.am || die
-
-	eautoreconf
-}
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index 1c7ceaf74b06..042269d56f7a 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -1,2 +1 @@
-DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2
 DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf
diff --git a/sys-apps/minijail/files/minijail-17-no-werror.patch b/sys-apps/minijail/files/minijail-17-no-werror.patch
new file mode 100644
index 000000000000..01d655f2bd55
--- /dev/null
+++ b/sys-apps/minijail/files/minijail-17-no-werror.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/770940
+https://bugs.gentoo.org/732014
+--- a/common.mk
++++ b/common.mk
+@@ -319,7 +319,7 @@ endif
+ # The same goes for CFLAGS.
+ COMMON_CFLAGS-gcc := -fvisibility=internal -ggdb3 -Wa,--noexecstack
+ COMMON_CFLAGS-clang := -fvisibility=hidden -ggdb
+-COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \
++COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Wformat=2 \
+   -fno-strict-aliasing $(SSP_CFLAGS) -O1
+ CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14
+ CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11
diff --git a/sys-apps/minijail/minijail-12.ebuild b/sys-apps/minijail/minijail-12.ebuild
deleted file mode 100644
index 9f0c093fd994..000000000000
--- a/sys-apps/minijail/minijail-12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="helper binary and library for sandboxing & restricting privs of service"
-HOMEPAGE="https://android.googlesource.com/platform/external/minijail"
-
-# Use GitHub mirror as Gitiles doesn't generate stable tarballs.
-SRC_URI="https://github.com/google/${PN}/archive/linux-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/libcap-ng:="
-DEPEND="${RDEPEND}
-	test? (
-		virtual/pkgconfig
-		>=dev-cpp/gtest-1.8.0:=
-	)"
-
-S="${WORKDIR}/${PN}-linux-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/minijail-12-makefile.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS
-		~SECCOMP ~SECCOMP_FILTER ~CGROUPS"
-	check_extra_config
-}
-
-src_configure() {
-	export LIBDIR="/usr/$(get_libdir)"
-	export USE_seccomp="$(usex seccomp)"
-	export USE_SYSTEM_GTEST=yes
-	if use test; then
-		export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)"
-		export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)"
-	else
-		export GTEST_CXXFLAGS='' GTEST_LIBS=''
-	fi
-	export VERBOSE=1
-}
-
-src_compile() {
-	tc-env_build emake all parse_seccomp_policy
-}
-
-src_test() {
-	GTEST_FILTER="-NamespaceTest.test_tmpfs_userns:NamespaceTest.test_namespaces" \
-		tc-env_build emake tests
-}
-
-src_install() {
-	dosbin minijail0
-	dolib.so libminijail{,preload}.so
-	dobin parse_seccomp_policy
-
-	doman minijail0.[15]
-	dodoc README.md
-
-	local include_dir="/usr/include"
-
-	"${S}"/platform2_preinstall.sh "${PV}" "${include_dir}"
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins libminijail.pc
-
-	insinto "${include_dir}"
-	doins libminijail.h scoped_minijail.h
-}
diff --git a/sys-apps/minijail/minijail-17.ebuild b/sys-apps/minijail/minijail-17.ebuild
index 9f0c093fd994..f9192fecbd38 100644
--- a/sys-apps/minijail/minijail-17.ebuild
+++ b/sys-apps/minijail/minijail-17.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"
@@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-linux-v${PV}"
 
 PATCHES=(
 	"${FILESDIR}/minijail-12-makefile.patch"
+	"${FILESDIR}/minijail-17-no-werror.patch"
 )
 
 pkg_pretend() {
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 793b91c57705..46b756def8e3 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2d116bdff27b..789ec6e3bdec 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -11,6 +11,7 @@ DIST gcc-10.4.0-patches-1.tar.xz 14392 BLAKE2B 76cc16bb611f1ac2020f0f430fc3f038e
 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
 DIST gcc-11-20220527.tar.xz 75770720 BLAKE2B 60b5457c022ba61615ae9ffd930ad19d96cb925713c0c883c44c9eb7b687ba1f9ac3c7bee0b50e43d6130fdd079696e9baf8bcac2584663fee695dd642f00a18 SHA512 74cdece429fa90ceb1c12dcae5241a53c4f222b14e4b5e50be8cf1b1a37582c9b63485492c1a3adb969c3a51964e8090182f6bf709390fb14002199a6d444005
 DIST gcc-11-20220603.tar.xz 75766680 BLAKE2B 03ca98cf3885785915d032296c6ee96429b849ecfe2ab3fb510044241a85dc29c91bf4d400fa89d5dac8cdf410ae6a4c50149a266fa0188182f45d55a8b76197 SHA512 b2e63821d08aa5a30e54872015c6790bfc173a90788ba64c7c6fe68e0e5cb4af730d9fdd7bf502959777ad4ba859e080b41216e52dd5b12e6ed7085b35210448
+DIST gcc-11-20220610.tar.xz 75771324 BLAKE2B ab3d2792b778961db0fedf0d965f37deec87832686ca127475146820c1f9b3a1c6872b9170c811288e891baf9de90e7dcce2f4ace96dbba0d96fff9d2757fb8d SHA512 17f70761378dd3b7bba341abfdb9274abe1bf75e61d6dd59edd5befcd10ddc02cad7fcb8f07eb0d10449b405066aa78fe8945f95e870f20b464ca90072a394d8
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220610.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220610.ebuild
new file mode 100644
index 000000000000..66746a359bd7
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20220610.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="0"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e96beac1a6bf..ac78c6f27215 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 94be25574cd2..c3e424e6396a 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -2,3 +2,4 @@ DIST fuse-overlayfs-1.7.1.tar.gz 103575 BLAKE2B 1fc92852f3afdead707af8745db03e2f
 DIST fuse-overlayfs-1.8.1.tar.gz 103753 BLAKE2B 42ac0b75b563cee9457721dfebe03355d930e074f44cda43d071e853df2d2192266f6b2901c4faa333414de45fb1b95e245a42ae15c52714e311a1aad98deeb6 SHA512 7a63f1f129c100615676bccdb0f7fd83c4e9901786064d98fa3776dd64dbb61c38913f8d0eff428a601cb44b1bfd3261ded5ec5e471b889c7cd28f81a859d8ad
 DIST fuse-overlayfs-1.8.2.tar.gz 103892 BLAKE2B 18473c9703d12befbd68b5c1374fd18233dca3663dc0c6346e0a0c2f6f8928a57e8c04cf151196db3d6404ca8816e5ef2826a989c86d3ec7171344a73cec189f SHA512 637fbde0e9481b31491fa7fbdce9315e3832e9de076668dddfeba407a0dd9ceb2072723348eb2a47586756da8a8242a040bc20dbb5e1ac3be3ffa795daf22b95
 DIST fuse-overlayfs-1.8.tar.gz 103726 BLAKE2B 12da116bba60c5833b43d130b24ba6a60fcaabe1248226fa30e8c0b2c2439a438c66b39d28a8d3dd0f65bf353c38811e87f23a2fdbd830982063a7b5df7b4808 SHA512 68a7b6a41fd2c44fbfb194d324cc6869d7f6ce198f7ff3ddf74e91f9679785ffa610634a6e35c2661549e0bb776bf68741be45501d860b1e8dd6814d2b3fb0ab
+DIST fuse-overlayfs-1.9.tar.gz 104063 BLAKE2B f18703e32644ccbd1b47e9120b13a8efe1227ca8c142dbe90ff174e33937a2882ba354a837f874b5cd7bf28d1de7bb5039b86b6123288bde1ffc570a68500fb6 SHA512 16f4feb8426c0d6f78082065a2c1c6afb96e4fc665e40e79e2b2692b0b21e77998a2195cf2cd81f505d0167318ed843f55be4eb16956aadaeab56f47ccbddc0b
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.9.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.9.ebuild
new file mode 100644
index 000000000000..ea15a96bde4e
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 79638f5135e9..edbfd044ed7a 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/kpatch/files/kpatch-0.9.4-no-werror.patch b/sys-kernel/kpatch/files/kpatch-0.9.4-no-werror.patch
new file mode 100644
index 000000000000..0667fdd91ca1
--- /dev/null
+++ b/sys-kernel/kpatch/files/kpatch-0.9.4-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/776925
+--- a/kpatch-build/Makefile
++++ b/kpatch-build/Makefile
+@@ -1,7 +1,7 @@
+ include ../Makefile.inc
+ 
+ CFLAGS += -MMD -MP -I../kmod/patch -Iinsn -Wall -Wsign-compare \
+-	  -Wconversion -Wno-sign-conversion -g -Werror
++	  -Wconversion -Wno-sign-conversion -g
+ LDLIBS = -lelf
+ 
+ TARGETS = create-diff-object create-klp-module create-kpatch-module
diff --git a/sys-kernel/kpatch/kpatch-0.9.4.ebuild b/sys-kernel/kpatch/kpatch-0.9.4.ebuild
index 5cdcff76d491..e30e6e2e09cf 100644
--- a/sys-kernel/kpatch/kpatch-0.9.4.ebuild
+++ b/sys-kernel/kpatch/kpatch-0.9.4.ebuild
@@ -34,6 +34,10 @@ DEPEND="
 	test? ( dev-util/shellcheck-bin )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+)
+
 pkg_setup() {
 	if use kmod; then
 		if kernel_is gt 3 9 0; then
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 686d80cfc47a..89f307e7b74c 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 3f4505428bdd..2facfae31737 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,3 +1,4 @@
 DIST element-v1.10.10.tar.gz 17541812 BLAKE2B 16e59f00f9fd0d220a00093a241a36c2b1c52b745545b66c9ecb57956eaf3b27fad871faa15c19c219de8d0f111392f17ccbc34bc71c969cc08bc7333ccb7af9 SHA512 dc7ab99d93c0aae71806b176340663a5f59cddc4b00ac7ed423a689f28d812db472398f75d1e0787a2a666ac9121544e1aba41d8550f9dc34b583d852eb74dad
 DIST element-v1.10.11.tar.gz 17554189 BLAKE2B bbd61969a8d0513b311ab65a99a83b1d4d9d4b5be39a492ac57726b86a2f84e32d4e71e95601d6fb95bf9f549b81190bbd995a8b481ab23ac69d898c82cf8e2c SHA512 003f865ed5e8ab89d8427338229af944123222e5f36dac10432e7f83beef20b992746a69a39f56ecf3bcc722644eff387d663f327b558620061ec43114a1bd63
 DIST element-v1.10.12.tar.gz 17643779 BLAKE2B 6d12241e3d2195ca7e8c791c563c44d1a3efa54c3221091dc85bd77e1192acf17767e010c4dc561fbaa5e9a2faa423f105d6a10e93792aab6749740a492cb90e SHA512 ad89d30d7599bc515546107a116570e27c0d943ed34878f846ee4dd2564d8d43b277f3a194e3beb5982fba78cd2fe650e3c24f38063ec4e48fe6956f3e679a95
+DIST element-v1.10.14.tar.gz 17539241 BLAKE2B 37095170ebfb50c2cc70268d8d342aa60a64e7bc1e319b839208e5e2c450a757eb4f6235354427b91e48c4070b9f802a63f75fc3e502bfce8f051d902709f24c SHA512 6b849f26054568f183cfe4ce12c3729b37771f3e1c7dac9f3a22d22671cd47598b4b53f90d6e9009862e2f239411e183d94b2a56ef9422a140719910ee8dfc15
diff --git a/www-apps/element/element-1.10.14.ebuild b/www-apps/element/element-1.10.14.ebuild
new file mode 100644
index 000000000000..bdccc2ddf91f
--- /dev/null
+++ b/www-apps/element/element-1.10.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+need_httpd
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 03e9f3f6db96..dfab6729436b 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index 5e80194f89a2..9c988692f43e 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -1 +1,2 @@
+DIST Pound-3.0.2.tgz 76000 BLAKE2B 0e3f2dc69771a1d1f3de00a721f02cdc4ff31f4d17ab81f64c368668f03c0c1f12484e2d40e7c1d2d203b033488f2bad57cafd8da5022dfe680a09cdc6b73bec SHA512 4c96a93df2b340049778ed7782377e521fbdd7b6ccaa157748b05941ac7a825b2688f37f3081a7e577b2fa1ec4f64d68a25d27af2210f59da5be0dc10d1391e9
 DIST Pound-3.0.tgz 75905 BLAKE2B 8834d2d57c81bf792d803bc2aef7ad5d17243539ea3fddab777ab3dbd7f903a2f771762ee8d4818c63b7c6380c253dc7c7465e10225f884c2bb968af3dfab831 SHA512 28426fa2d66efa310fce43fc57b87b6cd9d646573161ab880b139feec856710306002af623f023907bb77f8b37979cf2332dc3e16cde48c6d349d813c6ac47e2
diff --git a/www-servers/pound/files/pound-3.0.2-hpack.patch b/www-servers/pound/files/pound-3.0.2-hpack.patch
new file mode 100644
index 000000000000..d413082216ab
--- /dev/null
+++ b/www-servers/pound/files/pound-3.0.2-hpack.patch
@@ -0,0 +1,21 @@
+--- a/src/hpack.c
++++ b/src/hpack.c
+@@ -69,9 +69,6 @@ static size_t	 hbuf_left(struct hbuf *);
+ 
+ static struct hpack	 hpack_global;
+ 
+-#ifdef  __GLIBC__
+-/* these functions are available on BSD, but not on Linux */
+-
+ #include    <stdlib.h>
+ 
+ void *
+@@ -100,8 +97,6 @@ freezero(void *ptr, size_t size)
+     return;
+ }
+ 
+-#endif
+-
+ int
+ hpack_init(void)
+ {
diff --git a/www-servers/pound/metadata.xml b/www-servers/pound/metadata.xml
index 863eae94ad72..0a0f6e053ff8 100644
--- a/www-servers/pound/metadata.xml
+++ b/www-servers/pound/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Pound program is a reverse proxy, load balancer
 		and HTTPS front-end for Web server(s). Pound was developed to enable
diff --git a/www-servers/pound/pound-3.0.2.ebuild b/www-servers/pound/pound-3.0.2.ebuild
new file mode 100644
index 000000000000..f6667638c642
--- /dev/null
+++ b/www-servers/pound/pound-3.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P="${P/p/P}"
+
+DESCRIPTION="A http/https reverse-proxy and load-balancer"
+HOMEPAGE="https://www.apsis.ch/pound.html"
+SRC_URI="https://www.apsis.ch/pound/${MY_P}.tgz"
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+DEPEND="
+	dev-libs/libpcre:=
+	dev-libs/libyaml:=
+	dev-libs/nanomsg:=
+	dev-libs/openssl:=
+	net-libs/mbedtls:=
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hpack.patch
+)
+
+src_install() {
+	rm GPL.txt || die
+
+	dosbin "${BUILD_DIR}"/pound
+	doman "${S}"/man/pound.8
+	einstalldocs
+
+	dodir /etc/init.d
+	newinitd "${FILESDIR}"/pound.init-1.9 pound
+
+	insinto /etc
+	newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
+}
+
+pkg_postinst() {
+	elog "No demo-/sample-configfile is included in the distribution;"
+	elog "read the man-page for more info."
+	elog "A sample (localhost:8888 -> localhost:80)"
+	elog "for gentoo is given in \"/etc/pound.cfg\"."
+}
diff --git a/www-servers/pound/pound-3.0.ebuild b/www-servers/pound/pound-3.0.ebuild
index 449b52b0ebae..0279aa5ca978 100644
--- a/www-servers/pound/pound-3.0.ebuild
+++ b/www-servers/pound/pound-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,7 @@ DEPEND="
 	dev-libs/nanomsg:=
 	dev-libs/openssl:=
 	net-libs/mbedtls:=
+	elibc_musl? ( sys-libs/queue-standalone )
 "
 
 RDEPEND="${DEPEND}"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 2eb509f30524..2d7818bb2c6a 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/redshift/redshift-1.12-r6.ebuild b/x11-misc/redshift/redshift-1.12-r6.ebuild
index 757f68abebdb..997257dbf0c1 100644
--- a/x11-misc/redshift/redshift-1.12-r6.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="appindicator geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 69e540efb911..b02917a6816b 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 0b9532910b5b..68e10adb9c26 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1 +1,2 @@
 DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa
+DIST wmbattery-2.56.tar.gz 120578 BLAKE2B 992b3f2964b1ca06aabcc1727a972dcc3e7fbc294b2265c9d0435b3bb7d0c425cded78d4057d7d33ac6b3e70322d5b4b3c0cf4ce8142fb6b3222e85100937eb3 SHA512 834dd4b8b5f880c31c0c1c95c5f9580e8cc795ae8f5c56cf94957bd8d7383d4b3c0903063430a329533ae8b5eff8eed1a464cdcf3ad67bc9f6ef3c35cc9d5662
diff --git a/x11-plugins/wmbattery/wmbattery-2.56.ebuild b/x11-plugins/wmbattery/wmbattery-2.56.ebuild
new file mode 100644
index 000000000000..aef01b77a878
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.56.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="https://www.dockapps.net/wmbattery"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="apm +upower"
+
+RDEPEND="apm? ( sys-apps/apmd )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	upower? ( >=sys-power/upower-0.9.23 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO )
+
+src_configure() {
+	econf --disable-hal $(use_enable upower)
+}