diff --git a/Manifest.files.gz b/Manifest.files.gz
index b8beb306cd81..b82dee651edd 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b859b734db05..bc0663f97f2a 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 583ec6c7d2c3..e8f57784f7d2 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -6,3 +6,4 @@ DIST awscli-1.22.91.tar.gz 2186925 BLAKE2B e7f6b4a5dce1b0f2752621628a28c7af75ce1
 DIST awscli-1.22.92.tar.gz 2187466 BLAKE2B 570e2fbb3efa0cf1664acbe6cd995799b98142ccea4fb36a967e3b3a77da4947295b4c0c9376a6c8780c0c9109ebe2e1a5e24dfd6cfb758960a6df24b8296f0c SHA512 022b9c12a71eaf62a6bea30df33d9f30ee309c77690cb6b08b770e987adf3e5cf8581b0a097c0f4466c73e82d1daacc42cd73eff48390ef3c5ca3cc49bc37a23
 DIST awscli-1.22.93.tar.gz 2187925 BLAKE2B c4b13aada04aea6b320c9b93c83cce11a4081e6b13cb7e3a83f2ee2ba651de4dbf636cfaefeee049a5ab91519bbfa6bbea37bd5a0a06a84979684bbf7c90c65c SHA512 c13d363ffff11fe30d3b78966caebb9026bcdbb4a6b9eb6e641de4955f9f360b6a4ecae25e1315d3e4943ea341f0f4c3be2aacf5849be3906d1fb0b0a9102490
 DIST awscli-1.22.94.tar.gz 2194607 BLAKE2B 985ce46ac8c3a12abc983fda4d424dbfa5c5da26c5552af9895079bc1aaa925e7f0c35f469f6b7f917007e162ce340adc68e4ae1c79f72c673bdf965ee550cfa SHA512 d34ad97d50de64591f0239de94b81d2ab77f8f4e284a356abe684bcd4c4d8f4a2d5e47d67e7b59322898d4f5b3503991eb550a424f894001aec547fe07e58923
+DIST awscli-1.22.96.tar.gz 2195648 BLAKE2B 57793e65d63151b150015ef90784140a9d473618849500d81bcb94582c5bc7a66b52337148b3f5c4c6b7196d2ab302fa0592dda3d83f2ff3d4fe845d687d18cf SHA512 71fb2bbc3586868566996cb807d01e582d181d96e52754c7052fc93040124ac7a73813f10fb1b660458772155aaa4f0a4294a583d429717e0bf1f6b785f5b963
diff --git a/app-admin/awscli/awscli-1.22.96.ebuild b/app-admin/awscli/awscli-1.22.96.ebuild
new file mode 100644
index 000000000000..2040c8cb81d2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.96.ebuild
@@ -0,0 +1,66 @@
+# 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
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+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.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		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 "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+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/doas/Manifest b/app-admin/doas/Manifest
index d66ef45cbbce..ac4682ce68e4 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1 +1,2 @@
 DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
+DIST OpenDoas-6.8.2.tar.gz 32430 BLAKE2B 14c418537b17cb82ceb1d789acc74d17364390c04d0a8d81b65de2ce3feca800e48158c6a8ea066176edeea44252f4baa99d1abde0dfbdc548c06f96e6409984 SHA512 4a93ff477413c859ba2702e688fa4f83248fff85e61e12336838a1e9aa1a8d9963a9782e4bc5e58e8d04b86c2c8ceb6b235ae9d3b32b3e548a2514a43653137d
diff --git a/app-admin/doas/doas-6.8.2.ebuild b/app-admin/doas/doas-6.8.2.ebuild
new file mode 100644
index 000000000000..8e916bc9d889
--- /dev/null
+++ b/app-admin/doas/doas-6.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=OpenDoas
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="pam persist"
+
+BDEPEND="virtual/yacc"
+RDEPEND="pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CC AR
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		$(use_with pam) \
+		$(use_with persist timestamp) \
+	|| die "Configure failed"
+}
+
+pkg_postinst() {
+	if use persist ; then
+		ewarn "The persist/timestamp feature is disabled by default upstream."
+		ewarn "It may not be as secure as on OpenBSD where proper kernel support exists."
+	fi
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "By default, doas will deny all actions."
+		elog "You need to create your own custom configuration at ${EROOT}/etc/doas.conf."
+		elog "See https://wiki.gentoo.org/wiki/Doas for guidance."
+	fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bd4d37fe523b..0679921b873b 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild
index 828c146ee5a0..06acae2df4d6 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index c50965e5c670..1a66b190326a 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index 7a03f7747877..1c319944b72e 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1 +1,2 @@
 DIST gentoo-zsh-completions-20200914.tar.gz 25823 BLAKE2B 2a4af0fe85819f5cb8b3669f5a3b5b0e9672864a1562641c1760b7fa889648d3b405d5e28fd863bcea7800faca3c7392ecf3c5169755345bbf75d17c996c0de2 SHA512 a7f65e255a3c9f342d266d3a8604645c117124bd3f714d90aa63b3f6f873a4cf46224d7a9969061fc522107139b97695b8bbeb8a6dcb360f41128079adf9ce8c
+DIST gentoo-zsh-completions-20220112.tar.gz 25839 BLAKE2B 3cf9a26e14556520ff32172b0e97ee5cb5e3cf45569c97b6f3e701330490be831f211dde327fdd007df9b67df22c243f4e91e0f40b9d4d02551b0b3059d60708 SHA512 b06aa69348b0954b8cf635170fa743960e5d4c3988c0dfa6166e1d4d33bf112e24d1e28bd5a0b228a0d6e78509a8e62954217bbd30c099d99cad4ebab71b328d
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
new file mode 100644
index 000000000000..ac89d477c103
--- /dev/null
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+fi
+
+DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
+HOMEPAGE="https://github.com/gentoo/gentoo-zsh-completions"
+
+LICENSE="ZSH"
+SLOT="0"
+
+RDEPEND=">=app-shells/zsh-4.3.5"
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins src/_*
+
+	dodoc AUTHORS
+}
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
index 306738aed653..ac89d477c103 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f0bffdd4994f..bfdbc5de68ec 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index feb8e35e94a2..625007115eaa 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/qos-ch/cal10n/archive/v_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
deleted file mode 100644
index a333844f35d0..000000000000
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${P//-}"
-
-DESCRIPTION="Jacl is an implementation of Tcl written in Java"
-HOMEPAGE="http://tcljava.sourceforge.net"
-SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="doc"
-
-CDEPEND=">=dev-lang/tcl-8.4.5:*"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CRDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	rm -rf src/{Test.java,empty,tests,janino} || die
-	java-pkg-simple_src_compile
-	mv src/jacl/tcl src/ || die
-	java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
-	dodoc README ChangeLog known_issues.txt
-}
diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild
index 52961e1a7d22..f1cd44ee2aaa 100644
--- a/dev-java/jacl/jacl-1.4.1-r2.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="doc"
 
 CDEPEND=">=dev-lang/tcl-8.4.5:*"
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
index df8fd42a18eb..a1b75f2207b4 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV/
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 CDEPEND="
 	dev-java/xom:0
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
index bcb039f3fd97..06699464f97d 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
index 4018905b473b..9f498c036e19 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
index 813378abbbd7..967f7b6557b8 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
index e64c99255999..7be81d79f166 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
index 5ed928878473..8e150d3d2590 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
index c6359840b613..9aed30f65a2e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
index 09fffd263372..c53c20eb8511 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
index 06610489010c..d547050265ff 100644
--- a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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 fe319ccb2fa7..097023384d08 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ruby/ruby-2.6.10.ebuild b/dev-lang/ruby/ruby-2.6.10.ebuild
index 2198c3d0cff4..a8af3d34a265 100644
--- a/dev-lang/ruby/ruby-2.6.10.ebuild
+++ b/dev-lang/ruby/ruby-2.6.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.7.6.ebuild b/dev-lang/ruby/ruby-2.7.6.ebuild
index 8fe519a0667c..75675773f5d2 100644
--- a/dev-lang/ruby/ruby-2.7.6.ebuild
+++ b/dev-lang/ruby/ruby-2.7.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6d0ba1216872..1e81fcf2f186 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 1649b2507a37..0d1e5b8ce3d8 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,3 +1,4 @@
 DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
+DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
diff --git a/dev-libs/boost/boost-1.79.0.ebuild b/dev-libs/boost/boost-1.79.0.ebuild
new file mode 100644
index 000000000000..7b6ced2073cf
--- /dev/null
+++ b/dev-libs/boost/boost-1.79.0.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+#BDEPEND=">=dev-util/boost-build-${MAJOR_V}"
+BDEPEND=">=dev-util/boost-build-1.78.0-r1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usev !mpi --without-mpi)
+		$(usev !nls --without-locale)
+		$(usev !context '--without-context --without-coroutine --without-fiber')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build/src
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=shared
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam \
+		--prefix="${EPREFIX}"/usr \
+		"${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			--prefix="${EPREFIX}"/usr \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		--prefix="${ED}"/usr \
+		--includedir="${ED}"/usr/include \
+		--libdir="${ED}"/usr/$(get_libdir) \
+		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+pkg_preinst() {
+	# Yay for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the Boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 09230815dca6..13c070d58f92 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,2 +1,3 @@
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
+DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
diff --git a/dev-libs/glib/glib-2.72.1.ebuild b/dev-libs/glib/glib-2.72.1.ebuild
new file mode 100644
index 000000000000..49fab3db4863
--- /dev/null
+++ b/dev-libs/glib/glib-2.72.1.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use fam)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
index 0e9086ca0c2b..111e7c0a7915 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/newt/newt-0.52.21_p20210816.ebuild b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
index d9a843d2a8cd..595cac42ebae 100644
--- a/dev-libs/newt/newt-0.52.21_p20210816.ebuild
+++ b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlichvar/newt/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="gpm nls tcl"
 RESTRICT="test"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2f5cc9472153..ffb31e763fef 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index efff473b0d79..2233c6fcaad1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,3 +6,4 @@ DIST boto3-1.21.36.tar.gz 487111 BLAKE2B c812e80a2bd81f2feda25b9e43444d1587eb270
 DIST boto3-1.21.37.tar.gz 487557 BLAKE2B 1c716a07279ce2c1020faee9e2e81b2bde3ed6e4c56668fa76eabc03c7c0818f8dc3ac0fcef66d4007d892e1f227e8642757b6fa5d6e1e18184ad17a30a0e404 SHA512 512e7859e700a98aa3112e21bbd7653e39e7e21bc8f3ef623254322f18869bc9b8a65612a3a9133847c189c59b1e2480225b71bdebd38b2e42cf4820d7ab6972
 DIST boto3-1.21.38.tar.gz 487786 BLAKE2B c247f51e3a7a7f9c531ab18d0fa93b90881c869631bffe35be5482a463a6580e733915d4f966d5700cf6bd822676416e9431f261fd237cb9dd85440308399e2d SHA512 a1b09de7a1dbede4000d500d96028a9ae70c60aa0cc1fc74201d52bc76a83dc27937d422592985e22b3dd1b98359255e837f66f51bae59f2104b379bfa7e49b3
 DIST boto3-1.21.39.tar.gz 488120 BLAKE2B 7fc998ec59d19fd6ea0377443920e30bcacdce5f185200757a13758e5e5229a7bbd959cd6854d9520f8ca6737af9f1adba887f3caef50fb7bbc9a2a38df9b472 SHA512 7c949773e0791d170158f7a8cc47559dcd9b2b6fbe422325b12b7d90649244e0475a6c35cfa15e00f1a0f49d2e581ba27d78320514e4ab8e8533bfb8510b37eb
+DIST boto3-1.21.41.tar.gz 488529 BLAKE2B a07662e4499ea6e833ee7a207dbf84522369ae0609ee7ac305fb8afca572114a938a1c0a23d75404c86c6afc2a516148a565e9ff607898566beb9b552fa44c3e SHA512 620fea69e84de1c6e705a33b00ba137f8550e0590492e13ece24bdf8ba6439be58e31821404a6dded02873a69256568d5061bf9de19ab75c37630865dcf97373
diff --git a/dev-python/boto3/boto3-1.21.41.ebuild b/dev-python/boto3/boto3-1.21.41.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.41.ebuild
@@ -0,0 +1,63 @@
+# 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.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 "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 1b4f1d23bb5e..8e121304d381 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,3 +6,4 @@ DIST botocore-1.24.36.tar.gz 8899058 BLAKE2B c11df5acef305116433aeb4c4b999b8bdeb
 DIST botocore-1.24.37.tar.gz 8898823 BLAKE2B 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908 SHA512 412a656e879b09bf9f82d02e291e988499106dce1f589b1048adf2145774a5dd9a9ca5f18d2b6eaedd895e384cbf1836c7b6bdc0867a83c7b863bddea77727f4
 DIST botocore-1.24.38.tar.gz 8900705 BLAKE2B 1f1504856d5908df7d8af9f92847d1d7ac9d8ce0258a63bcea4b593aaae4d87e71da45becadb5873eab53ceea6916e4c6a4931efd797b0474e7bfe4f0b60eb46 SHA512 1cf7cf2acc7773ab9f5c4d01eca24191f6d27e3eddd98abd33348bf171bcaa2708e8c9a03ceb2676060a1f906d66e6982fe3bce3b78ed878abc30434812327c0
 DIST botocore-1.24.39.tar.gz 8901325 BLAKE2B ffdafe7b34c7114de12044d14dd9ba58f01b21455f51a527da55450840f7f74cfaee56babb105b18634b06293ef91427534ea08b47d223285046bd718cc6cc7a SHA512 13c24f4e305bc16441682f483b0478730f5487388d73e14fc3750e22fd3c4c1c958146264721f365b00d1cddd4222e7c0b5d0be26df171ba4e95091327a340c8
+DIST botocore-1.24.41.tar.gz 8906754 BLAKE2B ff2e19dca96137f7e6335ad41ce645d132989ddafecfe8be780166b697bd9fff18eaeddd7a88d4b76cf2aa95c1822f88590940d674ea82e97c14d7bdf6c1d5de SHA512 071fb09c50b3eacbb68ddc5831bb8fceef92e5cb8aad9e4b74b1ab65528edbefc83d0bc86271d87aea97d923813ab1613fe342be0815df7a350edf602dae49bd
diff --git a/dev-python/botocore/botocore-1.24.41.ebuild b/dev-python/botocore/botocore-1.24.41.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.41.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..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/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}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.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 "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index eef60eddc678..f8d354948f0b 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1 +1,2 @@
 DIST cmd2-2.4.0.tar.gz 680118 BLAKE2B 09f4893db7587dce9fd59103f8a1ef54c2b61248dd4aed313a90a390bb50e8927ef7a11dc5ca3af90b5ccf36ce16e0e18f3b555cc961a8c6862f7b8131f190ae SHA512 4ecd4c71294bee86f02b39a588c42a7232309db54459c950f77734926dedc3ec273237b9615bab6ef8a499c65442e3d6f7d2e9f159ccca021db0b450435ffbc0
+DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
new file mode 100644
index 000000000000..26a05e90d1bf
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.4.1.ebuild
@@ -0,0 +1,58 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel) + which(1).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		sys-apps/which
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest -p no:pytest-qt || die
+}
diff --git a/dev-python/flask/flask-2.0.3.ebuild b/dev-python/flask/flask-2.0.3.ebuild
index ee5a07934fcb..74b732b40776 100644
--- a/dev-python/flask/flask-2.0.3.ebuild
+++ b/dev-python/flask/flask-2.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/gpep517/gpep517-3.ebuild b/dev-python/gpep517/gpep517-3.ebuild
index ca1331982b9e..8e915e8707bf 100644
--- a/dev-python/gpep517/gpep517-3.ebuild
+++ b/dev-python/gpep517/gpep517-3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 2724ee9d058a..caeab0c831cf 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-python-6.42.0.tar.gz 9186585 BLAKE2B dd08082ef466c91999a6bfa6dfc
 DIST hypothesis-python-6.42.2.tar.gz 9187457 BLAKE2B ee191bed48db8984a1adb14fb655f0d03e76934eeec3004842567de904508dd5e0a565c14d81b018d55ca18827b03e14a54ae520110c5960a6d048690d17a5f8 SHA512 1c82e5d010cccc54c7c4a05f12ac33eae0d53fdb1d4ed68313907c390fb4c1e58d2afb57816fc8f0f7facacaca0fd6eab90e513ba2dc0b47fb73adb19e1f2a8a
 DIST hypothesis-python-6.42.3.tar.gz 9187948 BLAKE2B 3303cea4e8f2776f14defd88dcc2578f11e30bd5842a2cddf96478e31505d38f801a92e031e76070684befb2a9d63713f44b73eea7152e0bdc6cc0d16e25c08c SHA512 869e81b46da7786cc4ca981da56c916922a73fd129dc1f156d062343e40a9b74888bdda17ef2c95e6c3102dc762f7cf587d1aad4ba3b8138060990d2987a0bd1
 DIST hypothesis-python-6.43.0.tar.gz 9188330 BLAKE2B db237962b3c16c223fb49fff4c0c2e175f1969ce01c4ded3be3bcad0ff78c928f109016da58a4e9512e0d8fc3ea5ce9836732d00c74acc3ecd185ca1030849c1 SHA512 c1c3bda72cbe4f29be957d21682be1d1973f74afdf4adf95f388f05e4230781b16fb0004720620368b9aec4aa0623c4f79b7f3df16c37fbe9e812bb70a065af1
+DIST hypothesis-python-6.43.1.tar.gz 9188557 BLAKE2B 4dd3108c6162fb5b2a8f283e5499468b6a7ba3edb45cf6886d15cde5b6ee2ca6402c372d65f0576c4bba488d1e99f501bd61e8c26c0d887f716542287fe80a32 SHA512 9d01d4fd14d44445cc88e7eac28b2ce4555488fc87eccbb7739d97e23c42f608891532c17ef15c399d515f4b1856541c84f205630b3f5ba30ba7427774fcf2c1
diff --git a/dev-python/hypothesis/hypothesis-6.43.1.ebuild b/dev-python/hypothesis/hypothesis-6.43.1.ebuild
new file mode 100644
index 000000000000..7eae997f3fdb
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.43.1.ebuild
@@ -0,0 +1,65 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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}]
+		' python3_{8..10})
+	)
+"
+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 "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; 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/imageio-ffmpeg/Manifest b/dev-python/imageio-ffmpeg/Manifest
index 1068a1592770..c7abe349be60 100644
--- a/dev-python/imageio-ffmpeg/Manifest
+++ b/dev-python/imageio-ffmpeg/Manifest
@@ -1 +1,2 @@
 DIST imageio-ffmpeg-0.4.5.gh.tar.gz 24065 BLAKE2B b960a54435628fdefc1ce21c7f3e75c6ce1ffa3b838537173a28173589c3d430d805a7f7eb2b091250cce3b29660edaa1b442e28cbae998728cb89067304e9ac SHA512 c4180903f7194cac880c3851b08e4563c6e12cb6336e321ca35a7baf92ec1de5a49880fd05db9c7c266327642d75830cac4060371cbdc76448fb0a2c21ab0c1c
+DIST imageio-ffmpeg-0.4.7.gh.tar.gz 26301 BLAKE2B b794c4c69e43304e089cbab61ff70f3d7d305a515163d0cd0ee4fca678fbec029f01dda1559d6e10e287e56937d6c8f9b52c816df99977034867997c1e392c06 SHA512 4e97bd1258aaa43304a3240460f34a0a4b98340c1dc57f673644af36724935f9f2905378b38626b766e7f609fcbda48d2c58402dc3ef9c48c596936a4bd2cc06
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.7.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.7.ebuild
new file mode 100644
index 000000000000..042a40ebcb67
--- /dev/null
+++ b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="FFMPEG wrapper for Python"
+HOMEPAGE="https://pypi.org/project/imageio-ffmpeg/ https://github.com/imageio/imageio-ffmpeg"
+SRC_URI="
+	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# ffmpeg is used as executable during runtime
+RDEPEND="media-video/ffmpeg:*"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/setup_requires/d' -i setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 238c23cd7aab..b602c8993aa7 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,2 +1,3 @@
 DIST importlib_resources-5.4.0.tar.gz 30554 BLAKE2B f5be47cb63813aea15f65d251115cf398f695041871fdf6e8885fee11d9a9d7a2fbfd07efd494bd7c91077f99ab871e06d45f49de9f7e501a1691601206bfb55 SHA512 9262c185bdf79fad0a11caabc5c5df836702a74e140a9f60ace857e3f6a60fdb091639b2fb7129b17bad5a46968f43dda7d176fe39af495370dd31f04891fb1b
 DIST importlib_resources-5.6.0.tar.gz 30846 BLAKE2B 9a83554cd65b7851c4a8c977509f3fc255de3c5927661764e702eeae142b7d0cc75f809fe2a438b6f3acdb2facbdc3dadbf3f9dfed5615643dc15e04545dcf8c SHA512 d3c88dd5f1877b205b4c53ab9c8d4180ae87be0ff9dd11483024de40c84fe7da359f70337aeacc5df3b6deca88b903bb01850da8a54fd057e4174806ae767deb
+DIST importlib_resources-5.7.0.tar.gz 31185 BLAKE2B eefdc2380b580c274391369eb7a0432f74987a140a9a2eab2c43756148c1982ffa6f91ddad69992b85f88efdb5d22a40f0f95abd4e12de06be7d3d9ecd237579 SHA512 671395701ab96b8a4985f33470cfe2eea58fb60ca04d9763307958f08c535cdfee62b6532c33e24aa851b872e61498d169b4882788b9b829ba9549c84554f6fb
diff --git a/dev-python/importlib_resources/importlib_resources-5.7.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.7.0.ebuild
new file mode 100644
index 000000000000..c13797db40dd
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_resources"
+		version = "${PV}"
+		description = "Read resources from Python packages"
+	EOF
+}
diff --git a/dev-python/ini2toml/metadata.xml b/dev-python/ini2toml/metadata.xml
index 23719e79daa5..93b45a134be1 100644
--- a/dev-python/ini2toml/metadata.xml
+++ b/dev-python/ini2toml/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
diff --git a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
index ff462ecc58d4..21d19997c6ea 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/notebook[${PYTHON_USEDEP}]
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 6dd9ae5ce283..a612b571d21c 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1 +1,2 @@
 DIST mechanize-0.4.7.tar.gz 217289 BLAKE2B 9254cc88141b08bd9f97b63ac1dcb6b417e042cbefcf710ea9e1c340e8f6331ef9301a47bc6dd989970810ef36b97b867b81b3a44c9a4cdf283a77b04f25decd SHA512 f2796f322b1000818bcd4bcedf1d88538ba3a43151b74c950594a60dd7b5cf96ea4fcb605e30c93a5df095da35418401487928b9adfcca932e95dbf964d74c53
+DIST mechanize-0.4.8.tar.gz 218055 BLAKE2B bd91738092ac473ee6e65ee5f175479515f735a0433b112241f17061adf7e60ef6fa410fa549f088390b6ef6c8b2ff95e00335a626322ad170c88923c96e8e44 SHA512 71087481d27359b3ce795eae440ebb3a146f8dd5a6d5ac5dc91ae3c63f2c487beb472aa06b2925d6121faa038a0a8be50f6cecc54ee7209eb2b61e16242ffaa3
diff --git a/dev-python/mechanize/mechanize-0.4.8.ebuild b/dev-python/mechanize/mechanize-0.4.8.ebuild
new file mode 100644
index 000000000000..910c92be7113
--- /dev/null
+++ b/dev-python/mechanize/mechanize-0.4.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Stateful programmatic web browsing in Python"
+HOMEPAGE="https://github.com/python-mechanize/mechanize"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( BSD ZPL )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	"${EPYTHON}" run_tests.py || die
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 40b12363b06b..94ef41de64f9 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -2,3 +2,4 @@ DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 DIST mkdocs_pymdownx_material_extras-1.6.tar.gz 25764 BLAKE2B d28f98f82818aaaf81d70b80ed656d94f2454e366d1ebdf6ed6448adac112f6f5876ae43f791c29aab5d7f2da1d48f67d413f7e9dab57f1a85a497317fed36b0 SHA512 b815d773476d6a5a76c7a483907164870e37cfec31dc3a3596ccf21f4f93b8ea1ca52654cd1dfc64df67380e1c6f4dccb1d6534fa6425fb29cf0654f9cb094e1
 DIST mkdocs_pymdownx_material_extras-2.0.2.tar.gz 25789 BLAKE2B c1da5c38264e9186802e24a49c2c46f1f0da70640c3e806f26cb19f1f947b3eb5bdba31cc722fd566d40643504aa63adb8f59792c51be95f4baa2324cd0729f2 SHA512 fffc5982ef7127b2e990d9206de0f09e240250da2d56c1efed6e841dad759980300209f65faa0edf61bb1a882ebff367be6533fb3f47e7ebb606520def6143dc
+DIST mkdocs_pymdownx_material_extras-2.0.3.tar.gz 25866 BLAKE2B 6d14f7591c7519bed30de4ffde15a7fcf8d5ac20440609dc8cac0beb8adcd72f6882d1c4f15b809a423b657f951f8393b50832d125c45d946c420514615df624 SHA512 23964157be8773b9532580801498c4a31b29dfcb713e70e6adcc0d2c6a56350b7edd5d36dbbf58f6d946cf2fdcb4eb6cde72a63e4b40b5ca140d83f18e011375
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild
new file mode 100644
index 000000000000..2025f4982282
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild
@@ -0,0 +1,23 @@
+# 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="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index c382e1540d3d..805c3bd793bd 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1 +1,2 @@
+DIST numpydoc-1.2.1.tar.gz 70350 BLAKE2B f693436efa8e95527e4d7d20676b1f3e563369190a71cc4e2cc8ec38b65ad500f3e0e8a4e89ce48ebd3bf1190c8fff1ead05cc22dbbf80fdf147b9996b2b5add SHA512 439ff422d46ea8eaa26bd14ac41f8d64638d8df081a3b889eaadceafbde64f2a091f6363d0565759618d60c4fe869d8f62ec0878d45674022056058621048d0e
 DIST numpydoc-1.2.tar.gz 69659 BLAKE2B e5483ad3d6d82e9ff51d2d7cdc36c75407361059a696047f1d0fb7d3307c36ee056e8c0b9eb45fc11e4d341350c1b1dd021d60252055154c6907942e549b9555 SHA512 b8ea82a947c7fca9d02c2083f6040f2a1a115400e43257fd6ce7ac9b1b174d22ed7723053b87893d6bff8f47a625932297c884e853be4e00d3ae2262ad0161cf
diff --git a/dev-python/numpydoc/numpydoc-1.2.1.ebuild b/dev-python/numpydoc/numpydoc-1.2.1.ebuild
new file mode 100644
index 000000000000..f59030e0df57
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-1.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="https://pypi.org/project/numpydoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these require Internet (intersphinx)
+		numpydoc/tests/test_full.py::test_MyClass
+		numpydoc/tests/test_full.py::test_my_function
+	)
+	epytest --pyargs numpydoc
+}
diff --git a/dev-python/pyfuse3/pyfuse3-3.1.1.ebuild b/dev-python/pyfuse3/pyfuse3-3.1.1.ebuild
index ae3a573f428a..6c01439d2f3a 100644
--- a/dev-python/pyfuse3/pyfuse3-3.1.1.ebuild
+++ b/dev-python/pyfuse3/pyfuse3-3.1.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python 3 bindings for libfuse 3 with asynchronous API"
 HOMEPAGE="https://github.com/libfuse/pyfuse3"
-SRC_URI="https://github.com/libfuse/${PN}/releases/download/release-${PV}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libfuse/${PN}/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index a03da063ec3a..8be9b51d4886 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,7 +1,3 @@
-DIST pyghmi-1.5.22.tar.gz 221963 BLAKE2B 6705e904c481ddbb241fc8f8089e6bc9bcc142bfca9aaa518b2293b5dd387113fa4bbb418e748584f69fac5e8d1049d669eb73d24463adaaec3a891cae98f928 SHA512 cc665f8b9f4a0c9c127b9e895ba62e650cdb589f5c9edae6accaa5558f347d31725e8da446fcafb4f71ffadc17121d8b293160413f4a41055cb1720e9fa1ecde
-DIST pyghmi-1.5.31.tar.gz 236574 BLAKE2B 9ee7250bae2d87f552686845ae3056f0f646cd1a383587c195bfcc6dfa476b8582509c909f0008fc6751295e2e4e7d33bf822e8b529d67306fcc85412fc9af22 SHA512 d7c9c05b51780bef9d2b417c1a586f84ec87a9f1ff578ab019bfdc1a462decd907b2634fb1c830d0e369eb97122bfcba62ce79a4386c73c9854cde8f9fdeb65c
-DIST pyghmi-1.5.32.tar.gz 236662 BLAKE2B e2a58d1eb9c5000d1a7f6b795836fa617ac0847ff2e7c817a6bd65ffb9a1162546a25f890ba20400e4c8d5f72dda538f696c17a35542506cc171b80f99cb5a30 SHA512 b30ad1e200d23ed99280794e4e8e12c1a2412daa27e435183edbdcf57cb1d8ace8790845dd5ab0579f2a22b26eabc11e1d1f5845fb94fed019f461b9419d2763
-DIST pyghmi-1.5.33.tar.gz 237980 BLAKE2B 3599c0f56b665129e0432faa9aaab8fdbc831ec8398a3eea2034e68cbf1f75638ecad7ce7ae4e7ac0d51a4a7ac502837da8d3c421e836c88214d82ed7d0bc901 SHA512 1e187f5824491e9d4f48c2f0a5578ced6916764b6bc4f442045e34f37bff85bf16e3ab88df29f8797b15293282112aa04e2f0a375498e96c8aa7b3c7005d22dc
-DIST pyghmi-1.5.34.tar.gz 239758 BLAKE2B 3347498d7c1dc0eed102569cc7bc7c2084c694853a5e33c4145dadf623dc9a3db398fa32dc8fc87717a1df2db15c0477cbf59b1eba4c23cf558b45abbf47308e SHA512 fc61d5f8814366e51964b30e29f632d774ec8f202e4c05bd973fbe74e11f560a706e4abd6e01e4ae52d72dff2608c6abe72b5c46941884e472f159d2e4063047
 DIST pyghmi-1.5.36.tar.gz 240917 BLAKE2B 69e7f990c97a889d90e06feeb1b7b3fc73d6441cfe8ba7a22e0aa0e2b3553afb5166fb732699718dad04592aca95b8aaf28943ed92de136e45f381094b7c97af SHA512 b5536cf1c48929cb8acc7c9f77c09d0d51456cdfb2f74346387a483661332cdc02a614eac633a3e9aeabfac48b1a25a627668660be167fbf07b96c090ac6e197
 DIST pyghmi-1.5.37.tar.gz 241173 BLAKE2B 7094150c6002b59e1fcd9b337987d3506928222d55195c024027d31d281e5074210dac91c64853bbaac628dc112b9c4081a7193146927112dcc987f789faa018 SHA512 e70894f6e63afadc68bae88ebd8ff1f63904106db86b582b547a6f1eb7acde903352f08ffc62d7915e2baa45507f70331a6dc9f6b0dcd471fd330e39a69d064f
+DIST pyghmi-1.5.38.tar.gz 241170 BLAKE2B f056fb985ca1281fc481bf9ccaa5a6c86a05655fa6d3055e4ef2d9823e2893fff7ce795aebca5fafca5a368836372a71c73b6d8210b458f1dc54e9b68e429d4c SHA512 8d134cf2fa4c1226debe383832141e36f77a465acf02b2fcdf1ba5b621bf23444f40c69b9ce98c0ad096a8f2e5e9b04b4d0627d25354b76a130bece8d75f91c8
diff --git a/dev-python/pyghmi/pyghmi-1.5.22.ebuild b/dev-python/pyghmi/pyghmi-1.5.22.ebuild
deleted file mode 100644
index 4a81c80c555a..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.22.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="https://github.com/openstack/pyghmi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.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}]
-	)"
-
-python_test() {
-	stestr run || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyghmi/pyghmi-1.5.31.ebuild b/dev-python/pyghmi/pyghmi-1.5.31.ebuild
deleted file mode 100644
index f754962e698c..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.31.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="https://github.com/openstack-archive/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/pyghmi/pyghmi-1.5.32.ebuild b/dev-python/pyghmi/pyghmi-1.5.32.ebuild
deleted file mode 100644
index 8c831160b805..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.32.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="https://github.com/openstack-archive/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/pyghmi/pyghmi-1.5.33.ebuild b/dev-python/pyghmi/pyghmi-1.5.33.ebuild
deleted file mode 100644
index 8c831160b805..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.33.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="https://github.com/openstack-archive/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/pyghmi/pyghmi-1.5.34.ebuild b/dev-python/pyghmi/pyghmi-1.5.38.ebuild
similarity index 80%
rename from dev-python/pyghmi/pyghmi-1.5.34.ebuild
rename to dev-python/pyghmi/pyghmi-1.5.38.ebuild
index b5da25e535ba..6dc97bad8c60 100644
--- a/dev-python/pyghmi/pyghmi-1.5.34.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.5.38.ebuild
@@ -5,21 +5,25 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
-
 inherit distutils-r1
 
 DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="https://github.com/openstack-archive/pyghmi/"
+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}]
+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}]"
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
@@ -28,6 +32,7 @@ BDEPEND="
 		>=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/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index 3567d1a67960..c03abc041b06 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 flag-o-matic toolchain-funcs
+inherit distutils-r1 toolchain-funcs
 
 MY_PN=pyOpenSSL
 MY_P=${MY_PN}-${PV}
@@ -45,6 +45,7 @@ src_configure() {
 		#include <sys/types.h>
 		int test[sizeof(time_t) >= 8 ? 1 : -1];
 	EOF
+
 	if [[ ${?} -eq 0 ]]; then
 		PYOPENSSL_SKIP_LARGE_TIME=
 		einfo "time_t is at least 64-bit long"
@@ -62,5 +63,6 @@ python_test() {
 	[[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && deselect+=(
 		tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
 	)
+
 	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
index a8de6b438280..32fe4235b39c 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION=""
+DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
 HOMEPAGE="
 	https://pytest-skip-markers.readthedocs.io/en/latest/
 	https://github.com/saltstack/pytest-skip-markers
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
index d59d8d398cdc..5461a7b33b7a 100644
--- a/dev-python/pywinrm/Manifest
+++ b/dev-python/pywinrm/Manifest
@@ -1 +1,2 @@
 DIST pywinrm-0.4.2.tar.gz 37842 BLAKE2B cf9eb683b77f9a2cc2da9343ebcbbd27404024aea23784721fbea0bce4f8a2359c3647e81bb5fce7f9317bcd8d84cef2c5ec76b17d15153348e66897a6fe1319 SHA512 c5ff02606d6c887ef199cf814d931575728947bbbbff3c2ae7e52bed355408df06ea9351a4ae0b47a947a05ca3476054e501b3abcfca5a36643ef4cd6855a0e4
+DIST pywinrm-0.4.3.tar.gz 38356 BLAKE2B f998b9b56a60bf9d56b871e5fa8f59a4c0ec510b7a0a626b543b10e790596455797109eb2f929ff3224915ba8f6d1444843d735a67b9e2657fc6f705447dd056 SHA512 f6da28fc1c53a4c000539583ef5e6bdc108a2396f161a416cc151a8591478a6c7a577c5733374339fe3612a5a85046fb9cd44ca38f502aecd56b2723aae16943
diff --git a/dev-python/pywinrm/pywinrm-0.4.3.ebuild b/dev-python/pywinrm/pywinrm-0.4.3.ebuild
new file mode 100644
index 000000000000..b5ab98e4499c
--- /dev/null
+++ b/dev-python/pywinrm/pywinrm-0.4.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Windows Remote Management (WinRM) service"
+HOMEPAGE="https://github.com/diyan/pywinrm/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="kerberos"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-ntlm[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	kerberos? (
+		<dev-python/pykerberos-2.0.0[${PYTHON_USEDEP}]
+		dev-python/requests-credssp[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index 62304f5b98e7..46515e45809d 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1 +1,2 @@
 DIST requests_pkcs12-1.10.tar.gz 4284 BLAKE2B 46ebbb00921f356ccf5793fe486d3e0d71b9b1688cb49d1c846c2ef808087bb51b71c18e89539946bf4b0c8d47df5ae7acda342b0e1293bf8a031eba5ba0ace5 SHA512 139d1b1ae740db7667bb079f955610ebbe6327dd6f050d59a0e6603f21a9fe0afde8dcb2ec666bc83f6b4205de05948dacf39bdec2d9f26bf3eaa7d6998f2fbb
+DIST requests_pkcs12-1.14.tar.gz 4896 BLAKE2B a8a3f0796092c66c210616ace20fb15cd82beb3ff3c0c0d1f2dccbd1ed7d62092a1faa69986e4f23d0b94af54f7f9b8819730f0c04c251fb751256dbd4c6bb56 SHA512 2d97b44b676c9e6e6eef127494d6c4a34179b8f69d8674ad9ecd9aa4171e5eb46a29a45ad5b5e8fe9facf234c1b7645fc5c87cef2b336beab941ce3e684c6d25
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild
new file mode 100644
index 000000000000..24765222be05
--- /dev/null
+++ b/dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
+HOMEPAGE="https://github.com/m-click/requests_pkcs12"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=""
+
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test" # no tests
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 3fd0ec1b86a3..7f28bfd1ff63 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1 +1,2 @@
 DIST setproctitle-1.2.2.tar.gz 23960 BLAKE2B e05cd482a1a8f76689a57da97f8b139c31ca1ec314fc88439326537e4c7aa4283be14506a42f6aa600dac5478a3438c29f1edf5f492465d0df13786e8ed8e70d SHA512 e89651e4879a33681f2862cbd6b430520fe7e5b56331ff2804ad4d8d4bd0230c4270488b132497efcafbc105f575ed2b66caf667130978c899ebfdcb9949b4ba
+DIST setproctitle-1.2.3.tar.gz 23618 BLAKE2B 58bafb30a9b0da9cd552c7ed1ccd197a2ee7a3c70ae02773e6a857e4f16069126d2507f30206c83a24d84d030a1fc9306d024f4e5b988f73d95df049fa9c055f SHA512 ae94e3f5e1dd10e80488f81250e979a6a15c7c3ae399bf557612b9b1edbdcb8aec4e68a7f44ff7375a399ab53d6319dfb5c5c4a1e3a0bb824c40f6921c9d9c6b
diff --git a/dev-python/setproctitle/setproctitle-1.2.3.ebuild b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
new file mode 100644
index 000000000000..79f8c8defc12
--- /dev/null
+++ b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
@@ -0,0 +1,18 @@
+# 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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Allow customization of the process title"
+HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index c75288fd577e..f7e96deb6d98 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-autodoc-typehints-1.17.0.gh.tar.gz 26087 BLAKE2B d2193378160404dd18ee066dd09c299f69d92b3b747edcd88910a8eb29a707b0ad3f7c95e56a0137c19010d37bddd3d72c5d378dcf72376ea36d69ab2eba52d4 SHA512 0b35cbc3a26cd084c7c741df1ad0a0887eca9943adc16980f7dbc3304c00854bb2861b1314c126e59b2d59cdbff22f5f466cc433e485ec05e40ed93e36ee9650
 DIST sphinx-autodoc-typehints-1.18.0.gh.tar.gz 26201 BLAKE2B 00c2be7d1a9770bf3c2a133ae5f810703e70afc0ce3372c5e667ef9e8783ce74c28fd796211a8bb38507ed1d1142c52461c6d6002069756961dc8d95e837337b SHA512 fa2202551365e929b5dda4c97f9565fec124cb1edda3a957953f4d59716d1c1e28adca769c3dbeadf265763cfb123bf6fefce0f9d9467daf4043f93d360195e3
+DIST sphinx-autodoc-typehints-1.18.1.gh.tar.gz 26424 BLAKE2B a30b966d26e89a7771404d4f9434038e4f201458bda439bf8fb3d2c2fc6dac0f12743622193edf45335d04148c96b6c3d51c2c7fe5437cb67b3b272ab19b2f18 SHA512 6c788949d1d3903ac589283e9188d5db3e0f173be1bb1a4740a88fc0383d7011fe60e57d25af74a2fc147b3c4d76c48770515bb8dbdf4ff18fb4bfb110a4a241
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.1.ebuild
new file mode 100644
index 000000000000..566a798017bd
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.1.ebuild
@@ -0,0 +1,42 @@
+# 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 ~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[${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/stripe/Manifest b/dev-python/stripe/Manifest
index 80151106876e..d9887263edb2 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -2,3 +2,4 @@ DIST stripe-2.66.0.tar.gz 234929 BLAKE2B 289c3464c3aa9ef5ebeccaffde383271ca23e70
 DIST stripe-2.67.0.tar.gz 235426 BLAKE2B ee396b0b7d3991afdd81e6b051fad0168a7b3dcfaddccc7700292878fc437788dcc40480fea2131dd52e3b787dc6e7b420d6023079f55d9365f76076cc51070d SHA512 099208259c6ca8d69fd6f39f72b9f12f41eace2f0a2a08b017f6141ad06882df742749941326fb8d9898db7c59e32ed74a464ad372d6f7f0a929c9ae4e4d2475
 DIST stripe-2.70.0.tar.gz 239653 BLAKE2B d59d7b452e91169e83e4d4bc10b544fc94c48aa3a967c899136b1b9ea60e835d998c1a5a0c5e131989d9628c36b77e3fe133952dddbede69d0bcfa11dc9fc640 SHA512 62f40d82e4a5d37ce070a2457b8372d903993e209f6a042ab97a93f5ee98eb994c0cac070451e2b130df9a72f4a9ece65600266735b438aff3cc5cf09e217b27
 DIST stripe-2.71.0.tar.gz 239817 BLAKE2B c1b8fad45e7e9fee79f841502aaad1a849f345357d2facfab833bc50129c5d9eac6c2af128ef572f9d295da966b8a38b095786b44bf026eac6f6d001470ae60a SHA512 5acbaba1e2a5e063beafd0b67994a4a4c7d207f220a49e84b7ab3c0288a92150fd10048f7782e32c3033f4a920f5e81a0893610545e5d1f49ee6dbe62aa4b3a5
+DIST stripe-2.72.0.tar.gz 239987 BLAKE2B 8eb1ea8446cb106c75b0a005478ae28c893338ecc0bb2d0017ad7e9a775108ed0eac1d3e05a5038330b89a47ffc311d4d0367df63c9d0ce01552afd7e4f3e82e SHA512 b9f98ce94002cbebdad5e2b7dc90b4f4d1b4c637db7509881a346c772f90d2154a49109aee15f650559ed8c253e82f466a5a4b6409efc8e00442c80195e1a3a8
diff --git a/dev-python/stripe/stripe-2.72.0.ebuild b/dev-python/stripe/stripe-2.72.0.ebuild
new file mode 100644
index 000000000000..b88af4c76c63
--- /dev/null
+++ b/dev-python/stripe/stripe-2.72.0.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..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.122.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 9bd5a9280760..4ff87c59a230 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,4 @@
 DIST svg-path-5.0.1.gh.tar.gz 71178 BLAKE2B 3b8c1e30c913aff770d73eb5bbb4ded19363a80015f7e9b4ab63b46d6bdf7866fe800a702d328d571d744fbdadb097e843f89130b50e0d60398b6914d9740c9f SHA512 95a286853f4f5497297ec27e261f1864ce9829fb7caa73c69b9d4d1449463a871ae0a74fa85619bf3cc24cfa329944c9c970c6f89ff6c5c1878473f433aa6bfe
 DIST svg-path-5.1.gh.tar.gz 74165 BLAKE2B 170608b5133902eab77fa03fa042cb4a8b9f7a6c895b5faae567e7d8de574b0de55a68274cd3adbb0cfcbb1b60aec2432529fe5063b40657b0ca5cab59e205fe SHA512 a8812bd9bc5da3f0f2bd34494cb1e64f3a3dc5b34db75e35c89872b7a1caa91062cfc97b5f1b2bbb5f955b70a71052f2962c1d8769d508c945ec553b003869d4
+DIST svg-path-6.0.gh.tar.gz 39195 BLAKE2B a2fd54705a1c41057325a8d9f1151ca7393b4caf496157b4860dd8fb9cda05dcf5bdfe0d601b59c3e25a70e2e01042864936dc5e87b45b7a94e03f4861899884 SHA512 3d51b4912786a5d2bb38f1a98b8b7f4dd0b8e62cdd5e899802eff19bb95d43f4f4c278fbb02951e03e32eff031247a92c95699950be775076d24be37bb6ce70f
 DIST svg.path-4.1.tar.gz 18228 BLAKE2B 3b70a37336078f0c4fb9ae1754cf92df7be957ac632931e4151ea158b05e54a29b68b74b9c69694d3e79986c13095e357fa52a8cecff3d1ad5ab3e2ef7c13015 SHA512 fb302c65f85bd61d98baab9e2a9707bc82f1bf02f3c9a34e5b864dcc7d2e03f85bd26a4fadd91a4249dbc37ae13f57eb5cdfc2805cbcb4f693d6f5c8863a3e92
diff --git a/dev-python/svg-path/svg-path-6.0.ebuild b/dev-python/svg-path/svg-path-6.0.ebuild
new file mode 100644
index 000000000000..b5143bdf5530
--- /dev/null
+++ b/dev-python/svg-path/svg-path-6.0.ebuild
@@ -0,0 +1,33 @@
+# 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="svg.path-${PV}"
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="
+	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	src/svg/path/tests/test_image.py::ImageTest::test_image
+)
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index c7957293537e..78fdd196ebfb 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch b/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch
new file mode 100644
index 000000000000..4ad80127f516
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/833488
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -44,6 +44,8 @@
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
+ 
++#include <array>
++
+ // compatibility with libdrm <= 2.4.74
+ #ifndef DRM_FORMAT_RESERVED
+ #define DRM_FORMAT_RESERVED           ((1ULL << 56) - 1)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
index 4743cce364a5..2c07d29ec9f6 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
@@ -33,7 +33,10 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" ) # upstream pending
+PATCHES=(
+	"${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending
+	"${FILESDIR}/${PN}-5.15.3-clang.patch"
+)
 
 src_configure() {
 	local myqmakeargs=(
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index a2de5e3084d6..ec74cca0d78e 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
index c872700c581d..80d830ef38b6 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/flavorjones/mini_portile"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
index a70adea1c437..c125f5d9de48 100644
--- a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 22944c128dc0..a6b5dc80980a 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index f311fa642643..227b3173730a 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,2 +1,3 @@
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
+DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
diff --git a/dev-util/boost-build/boost-build-1.79.0.ebuild b/dev-util/boost-build/boost-build-1.79.0.ebuild
new file mode 100644
index 000000000000..5efc205f8f68
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.79.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://www.boost.org/build/"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+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"
+IUSE="examples"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-1.78.0-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch
+	"${FILESDIR}"/${PN}-1.78.0-no-implicit-march-flags.patch
+)
+
+src_unpack() {
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	default
+
+	pushd .. >/dev/null || die
+	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
+	popd >/dev/null || die
+}
+
+src_configure() {
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+	${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed"
+}
+
+src_test() {
+	# Forget tests, bjam is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/{bjam,b2}
+
+	insinto /usr/share/boost-build/src
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 09230815dca6..13c070d58f92 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,2 +1,3 @@
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
+DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
new file mode 100644
index 000000000000..672168a9fcce
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 09230815dca6..13c070d58f92 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,2 +1,3 @@
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
+DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
diff --git a/dev-util/glib-utils/glib-utils-2.72.1.ebuild b/dev-util/glib-utils/glib-utils-2.72.1.ebuild
new file mode 100644
index 000000000000..3196415b47e4
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.72.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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 ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild
index ad99d3acbe94..6ca6d4e320f6 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch
new file mode 100644
index 000000000000..dcbe99878f05
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/787662
+https://sourceforge.net/p/mingw-w64/mingw-w64/ci/ab0fa5ad3c67d634fd7754d9473d1bb7051f9bf0/tree/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c?diff=6a0e9165008f731bccadfc41a59719cf7c8efc02
+--- a/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c
++++ b/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c
+@@ -121,6 +121,7 @@
+ u_quad_t	__umoddi3(u_quad_t a, u_quad_t b);
+ int		__ucmpdi2(u_quad_t a, u_quad_t b);
+ quad_t	__divmoddi4(quad_t a, quad_t b, quad_t *rem);
++u_quad_t	__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem);
+ 
+ #endif /* !_LIBKERN_QUAD_H_ */
+ 
+@@ -573,6 +574,12 @@
+ 	return (negq ? -uq : uq);
+ }
+ 
++u_quad_t
++__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem)
++{
++  return __qdivrem(a, b, rem);
++}
++
+ #else
+ static int __attribute__((unused)) dummy;
+ #endif /*deined (_X86_) && !defined (__x86_64__)*/
+
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild
index 3dfff3894bf5..66146673f8ce 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ S="${WORKDIR}/mingw-w64-v${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
 	"${FILESDIR}"/${PN}-8.0.0-__rdtsc.patch
+	"${FILESDIR}"/${PN}-8.0.0-udivmod.patch
 )
 
 is_crosscompile() {
diff --git a/dev-util/pahole/pahole-1.23.ebuild b/dev-util/pahole/pahole-1.23.ebuild
index 1c0d1849d0ec..d04b78096186 100644
--- a/dev-util/pahole/pahole-1.23.ebuild
+++ b/dev-util/pahole/pahole-1.23.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 364026108187..5954f8fac3dd 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass
index 359b5177bb37..784254aecf4f 100644
--- a/eclass/latex-package.eclass
+++ b/eclass/latex-package.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: latex-package.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Matthew Turk <satai@gentoo.org>
 # Martin Ehmsen <ehmsen@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: An eclass for easy installation of LaTeX packages
 # @DESCRIPTION:
 # This eClass is designed to be easy to use and implement.  The vast majority of
@@ -51,21 +51,24 @@
 # you must either grab each file individually, or find a place to mirror an
 # archive of them.  (iBiblio)
 
+case ${EAPI} in
+	7) inherit eapi8-dosym ;;
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 if [[ -z ${_LATEX_PACKAGE_ECLASS} ]]; then
 _LATEX_PACKAGE_ECLASS=1
 
 RDEPEND="virtual/latex-base"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r5"
 
-case ${EAPI:-0} in
-	[0-6])
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	7)	;;
-	*)	die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
-esac
-
 HOMEPAGE="http://www.tug.org/"
+
+# @ECLASS_VARIABLE: TEXMF
+# @DESCRIPTION:
+# Top-level installation path.
 TEXMF="/usr/share/texmf-site"
 
 # @ECLASS_VARIABLE: SUPPLIER
@@ -90,7 +93,7 @@ LATEX_DOC_ARGUMENTS=""
 # It installs the files found in the current directory to the standard locations
 # for a TeX installation
 latex-package_src_doinstall() {
-	debug-print function $FUNCNAME $*
+	debug-print-function "${FUNCNAME}" "$@"
 
 	# Avoid generating font cache outside of the sandbox
 	export VARTEXFONTS="${T}/fonts"
@@ -103,23 +106,26 @@ latex-package_src_doinstall() {
 		case ${1} in
 			"sh")
 				while IFS= read -r -d '' i; do
-					dobin ${i}
+					dobin "${i}"
 				done < <(find -maxdepth 1 -type f -name "*.${1}" -print0)
 				;;
 
 			"sty" | "cls" | "fd" | "clo" | "def" | "cfg")
 				while IFS= read -r -d '' i; do
-					insinto ${TEXMF}/tex/latex/${PN}
-					doins ${i}
+					insinto "${TEXMF}/tex/latex/${PN}"
+					doins "${i}"
 				done < <(find -maxdepth 1 -type f -name "*.${1}" -print0)
 				;;
 
 			"dvi" | "ps" | "pdf")
 				while IFS= read -r -d '' i; do
 					insinto /usr/share/doc/${PF}
-					doins ${i}
-					dosym /usr/share/doc/${PF}/$(basename ${i}) ${TEXMF}/doc/latex/${PN}/${i}
-					docompress -x /usr/share/doc/${PF}/$(basename ${i})
+					doins "${i}"
+					local dosym=dosym
+					[[ ${EAPI} == 7 ]] && dosym=dosym8
+					${dosym} -r "/usr/share/doc/${PF}/$(basename "${i}")" \
+						"${TEXMF}/doc/latex/${PN}/${i}"
+					docompress -x "/usr/share/doc/${PF}/$(basename "${i}")"
 				done < <(find -maxdepth 1 -type f -name "*.${1}" -print0)
 				;;
 
@@ -127,17 +133,18 @@ latex-package_src_doinstall() {
 				if ! in_iuse doc || use doc ; then
 					while IFS= read -r -d '' i; do
 						[[ -n ${LATEX_PACKAGE_SKIP} ]] &&
-						has ${i##*/} ${LATEX_PACKAGE_SKIP} &&
+						has "${i##*/}" ${LATEX_PACKAGE_SKIP} &&
 						continue
 
 						einfo "Making documentation: ${i}"
 						# some macros need compiler called twice, do it here.
-						set -- pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode ${i}
+						set -- pdflatex ${LATEX_DOC_ARGUMENTS} \
+							--halt-on-error --interaction=nonstopmode "${i}"
 						if "${@}"; then
 							"${@}"
 						else
 							einfo "pdflatex failed, trying texi2dvi"
-							texi2dvi -q -c --language=latex ${i} || die
+							texi2dvi -q -c --language=latex "${i}" || die
 						fi
 					done < <(find -maxdepth 1 -type f -name "*.${1}" -print0)
 				fi
@@ -145,27 +152,27 @@ latex-package_src_doinstall() {
 
 			"tfm" | "vf" | "afm")
 				while IFS= read -r -d '' i; do
-					insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN}
-					doins ${i}
+					insinto "${TEXMF}/fonts/${1}/${SUPPLIER}/${PN}"
+					doins "${i}"
 				done < <(find -maxdepth 1 -type f -name "*.${1}" -print0)
 				;;
 
 			"pfb")
 				while IFS= read -r -d '' i; do
-					insinto ${TEXMF}/fonts/type1/${SUPPLIER}/${PN}
-					doins ${i}
+					insinto "${TEXMF}/fonts/type1/${SUPPLIER}/${PN}"
+					doins "${i}"
 				done < <(find -maxdepth 1 -type f -name "*.pfb" -print0)
 				;;
 			"ttf")
 				while IFS= read -r -d '' i; do
-					insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN}
-					doins ${i}
+					insinto "${TEXMF}/fonts/truetype/${SUPPLIER}/${PN}"
+					doins "${i}"
 				done < <(find -maxdepth 1 -type f -name "*.ttf" -print0)
 				;;
 			"bst")
 				while IFS= read -r -d '' i; do
-					insinto ${TEXMF}/bibtex/bst/${PN}
-					doins ${i}
+					insinto "${TEXMF}/bibtex/bst/${PN}"
+					doins "${i}"
 				done < <(find -maxdepth 1 -type f -name "*.bst" -print0)
 				;;
 
@@ -198,10 +205,10 @@ latex-package_src_doinstall() {
 # Calls latex for each *.ins in the current directory in order to generate the
 # relevant files that will be installed
 latex-package_src_compile() {
-	debug-print function $FUNCNAME $*
+	debug-print-function "${FUNCNAME}" "$@"
 	while IFS= read -r -d '' i; do
 		einfo "Extracting from ${i}"
-		latex --halt-on-error --interaction=nonstopmode ${i} || die
+		latex --halt-on-error --interaction=nonstopmode "${i}" || die
 	done < <(find -maxdepth 1 -type f -name "*.ins" -print0)
 }
 
@@ -209,7 +216,7 @@ latex-package_src_compile() {
 # @DESCRIPTION:
 # Installs the package
 latex-package_src_install() {
-	debug-print function $FUNCNAME $*
+	debug-print-function "${FUNCNAME}" "$@"
 	latex-package_src_doinstall all
 	einstalldocs
 }
@@ -219,7 +226,7 @@ latex-package_src_install() {
 # Calls latex-package_rehash to ensure the TeX installation is consistent with
 # the kpathsea database
 latex-package_pkg_postinst() {
-	debug-print function $FUNCNAME $*
+	debug-print-function "${FUNCNAME}" "$@"
 	latex-package_rehash
 }
 
@@ -228,7 +235,7 @@ latex-package_pkg_postinst() {
 # Calls latex-package_rehash to ensure the TeX installation is consistent with
 # the kpathsea database
 latex-package_pkg_postrm() {
-	debug-print function $FUNCNAME $*
+	debug-print-function "${FUNCNAME}" "$@"
 	latex-package_rehash
 }
 
@@ -236,10 +243,10 @@ latex-package_pkg_postrm() {
 # @DESCRIPTION:
 # Rehashes the kpathsea database, according to the current TeX installation
 latex-package_rehash() {
-	debug-print function $FUNCNAME $*
+	debug-print-function "${FUNCNAME}" "$@"
 	texmf-update
 }
 
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
-
 fi
+
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 15d61faf5c65..b67be4281fc6 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index fb23736138a2..68270362a7df 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1 @@
-DIST freeciv-3.0.0.tar.xz 33421584 BLAKE2B aafd69767c947b26b410e520c674604aa06b51080de35b14bab584b2baf5259fe0b11efb97601341f594d054a664cf0cbf4bb29763919a482f097823d2f024ab SHA512 5c3774cc1510f1aedac0be043cb0684230e230674444031ad1b88c6320a1aab1308452719950d49e25b29f8c2ee9e4e96cc40cdf89ac23609c5422c8beeccd37
+DIST freeciv-3.0.1.tar.xz 33528292 BLAKE2B e19cae8a02aa4b9afc2895560aa7a8d6135a63a0e757c348a75e72522448a026874f8f0120448b38ca2fee0ecc42dd04d80345d9877554168ad07ca2a20e5dcc SHA512 0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34
diff --git a/games-strategy/freeciv/freeciv-3.0.0.ebuild b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
similarity index 93%
rename from games-strategy/freeciv/freeciv-3.0.0.ebuild
rename to games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
index 7ff9b9132dcd..01f0ad879e67 100644
--- a/games-strategy/freeciv/freeciv-3.0.0.ebuild
+++ b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
@@ -25,19 +25,21 @@ IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline s
 
 REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
 
+# postgres isn't yet really supported by upstream
 RDEPEND="
 	app-arch/bzip2
 	app-arch/xz-utils
 	net-misc/curl
+	dev-libs/icu:=
 	sys-libs/zlib
 	auth? (
-		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-		mysql? ( dev-db/mysql-connector-c:0= )
+		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) )
+		mysql? ( dev-db/mysql-connector-c:= )
 		sqlite? ( dev-db/sqlite:3 )
 	)
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+	dedicated? ( aimodules? ( dev-libs/libltdl ) )
 	!dedicated? (
-		media-libs/libpng:0
+		media-libs/libpng
 		gtk? ( x11-libs/gtk+:3 )
 		mapimg? ( media-gfx/imagemagick:= )
 		modpack? ( x11-libs/gtk+:3 )
@@ -54,20 +56,21 @@ RDEPEND="
 			media-libs/sdl2-image[png]
 			media-libs/sdl2-ttf
 		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
+		server? ( aimodules? ( sys-devel/libtool ) )
 		sound? (
 			media-libs/libsdl2[sound]
 			media-libs/sdl2-mixer[vorbis]
 		)
 	)
-	readline? ( sys-libs/readline:0= )
+	readline? ( sys-libs/readline:= )
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
 	!dedicated? ( x11-base/xorg-proto )
 "
-# postgres isn't yet really supported by upstream
+# Calls gzip during build
 BDEPEND="
+	app-arch/gzip
 	virtual/pkgconfig
 	!dedicated? ( nls? ( sys-devel/gettext ) )
 "
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index cbb6e2eb19c4..c32aea15878e 100644
Binary files a/lxqt-base/Manifest.gz and b/lxqt-base/Manifest.gz differ
diff --git a/lxqt-base/liblxqt/liblxqt-1.0.0.ebuild b/lxqt-base/liblxqt/liblxqt-1.0.0.ebuild
index 7f3e71fa6af1..6f412a589452 100644
--- a/lxqt-base/liblxqt/liblxqt-1.0.0.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-1.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ BSD"
diff --git a/lxqt-base/libsysstat/libsysstat-0.4.6.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.6.ebuild
index 2db5cda1a76c..7bdae4991e5a 100644
--- a/lxqt-base/libsysstat/libsysstat-0.4.6.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.4.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/lxqt-base/lxqt-about/lxqt-about-1.0.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-1.0.0.ebuild
index 1be75c532b3a..049e9682a1a5 100644
--- a/lxqt-base/lxqt-about/lxqt-about-1.0.0.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-1.0.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-1.0.0.ebuild
index b17d9b2ac386..9fa45d6dd38f 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-1.0.0.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-config/lxqt-config-1.0.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.0.0.ebuild
index 2bd26e077de7..57c6871cf044 100644
--- a/lxqt-base/lxqt-config/lxqt-config-1.0.0.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-1.0.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-1.0.1.ebuild
index 57747d43b1ab..a2ec1c85843d 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-1.0.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-1.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-1.0.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-1.0.0.ebuild
index 6bd74b8d7729..a12eda5f4f24 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-1.0.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-1.0.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt-project.org/"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-1.0.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-1.0.0.ebuild
index dfe31f5d325c..f6955f4ef780 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-1.0.0.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-1.0.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-1.0.0.ebuild
index c173d4101f7c..3aeb55b1c45c 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-1.0.0.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-1.0.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-1.0.0.ebuild
index 4769bd235257..57e537d4e867 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-1.0.0.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-1.0.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-1.0.0.ebuild
index 8fd905199374..96a414bab4e1 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-1.0.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-1.0.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-1.0.0.ebuild
index 28b96966ebb5..fca81c3abd44 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-1.0.0.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-1.0.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-1.0.0.ebuild
index a92cc0b27f51..b9a35de17db2 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-1.0.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-1.0.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-1.0.0.ebuild
index 809aed24eff0..771056d60668 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-1.0.0.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-session/lxqt-session-1.0.1.ebuild b/lxqt-base/lxqt-session/lxqt-session-1.0.1.ebuild
index 448934d1ca2d..4d356a40a8f4 100644
--- a/lxqt-base/lxqt-session/lxqt-session-1.0.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-1.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="+udev"
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-1.0.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-1.0.0.ebuild
index c76347f9252f..f966cde78e52 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-1.0.0.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-1.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 49efccd448d5..d7f54b4cc481 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 715b4bedd19f..d60e3d0c2992 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
 DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-2.2.1.tar.gz 5503979 BLAKE2B 304dee7e24dcff896e1a12b0eb0f6bb4ccd58067249fd5090f53d0e55dd401f16b037e7519b07e465ccba6c177113ab1f00e1e3983d0f3345be392bccbe2f43b SHA512 2dd29a095698b7bb98dd5631a507ac1eb655d5db22d0e2506dea5d91663483aefb722e99ba8ad53f4e776189163d5339bba03ec41182c13aa9d665ba321f0941
 DIST mutt-2.2.2.tar.gz 5507066 BLAKE2B dd23e2e75b1656ac0351d10df266432820dd32acd44310e586f8c5deec187648e61c7b9e880bcbbaa09a9d6e8bd67b205f43284a729ae6ff95adb4e2bc15724a SHA512 da236c535a4dd18ed92f4b226a009711098c87cc28bbcf3abcd5f31f3ac074abe830f4f7c98cc8cda738a7a6d9421a088915094b33e53e32e9649ccccefe3481
+DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
 DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-DIST mutt-gentoo-2.2.1-patches-r0.tar.xz 23164 BLAKE2B 755a5904fd68a577c96d78a311b5cd0713df4fa884c18c14ca4c88c48b56997a6372af32391201843e7aa8a7cb9cd7002105f217f42c9dec46073e2fe3ccf1bc SHA512 5d022aa2a2ee83f394c52957ad958ba8739fa9395d8ea7c96c1f1138b9df4413ff9e3209e36741666549232e5595cae77bf04ce180e34fac34594a2886084e6d
 DIST mutt-gentoo-2.2.2-patches-r0.tar.xz 23160 BLAKE2B 2bc09d2aa67102b382c2466773868ba32f38827e44efc7ee2461fa592607a926547013f6c232ac2d6d0cd7dc07da386a0995c7819273b4c96c28a1a6140248a4 SHA512 3b45957d92a9d3f2c185965d226c137dcbb11eb58e497a4dc5ab49041eba79c7436b8239ceb625e32ef0453b7909d925a6238ec75dfa3f267eea46e86474758a
+DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
diff --git a/mail-client/mutt/mutt-2.2.1.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.2.1.ebuild
rename to mail-client/mutt/mutt-2.2.3.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5190241c0f90..c3bd4bf0da39 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
index 17b5a9fae4ce..e41652a1ccca 100644
--- a/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch b/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch
deleted file mode 100644
index a448deec37da..000000000000
--- a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2483ee56960c99c35036273fc9fc2877eac772fc Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 20 Oct 2021 19:46:08 +0200
-Subject: [PATCH] fix pkg-config name and include directory search
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- cmake/Modules/FindLib3MF.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
-index 44858364..ad2f01ca 100644
---- a/cmake/Modules/FindLib3MF.cmake
-+++ b/cmake/Modules/FindLib3MF.cmake
-@@ -14,11 +14,11 @@
- # Travis CI Ubuntu Trusty environment has some issue with pkg-config
- # not finding the version.
- find_package(PkgConfig REQUIRED QUIET)
--pkg_check_modules(PC_LIB3MF lib3MF)
-+pkg_check_modules(PC_LIB3MF lib3mf)
- set(LIB3MF_VERSION ${PC_LIB3MF_VERSION})
- 
- find_path(LIB3MF_INCLUDE_DIRS
--    NAMES Model/COM/NMR_DLLInterfaces.h
-+    NAMES lib3mf_implicit.hpp
-     HINTS $ENV{LIB3MF_INCLUDEDIR}
-           ${PC_LIB3MF_INCLUDEDIR}
-           ${PC_LIB3MF_INCLUDE_DIRS}
--- 
-2.33.1
-
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index f7e74169b9ec..996bf04653fb 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-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=8
@@ -47,6 +47,7 @@ RDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtopengl:5
+		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		x11-libs/qscintilla:=
 		dbus? ( dev-qt/qtdbus:5 )
@@ -71,8 +72,6 @@ DOCS=(
 	doc/testing.txt
 )
 
-PATCHES=( "${FILESDIR}"/${P}-fix-pkg-config-name-and-include-directory-search.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DCLANG_TIDY=OFF
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 801722e80a4e..3b64ea792929 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,4 +1,3 @@
-DIST plantuml-1.2022.1.tar.gz 5395748 BLAKE2B 394280c9abf739f35ecf7e0ac84ccb1dba770ab0eff566a46c2e141227e556c17578ed3f5ccffffe7df82d7b7f3cd2d8a86c9d214d16557fe8e8b789a66acd7e SHA512 c510c1291dca58ef81626d3b416db5aeb5060958698cf37a6552a6eea820ce332d00f2b21cd382dadd18035b5f83a305973cfbe1137b09313ec63babeaad5660
 DIST plantuml-1.2022.2.tar.gz 5396602 BLAKE2B 5919495af6d15805ef379ae1a4630fa739620abe48ebef65ae034d16a9811233ae98d60e5ae2cc5e1b4a9d682bef34d70fd0ae42a0d16b5a6f44821df86ae63a SHA512 f61d7dbed7d7b6771d172ae8fb2a7af0c111a986330fddf5b8fbb36e7ebed8f598ff748d6f35b1c1ffa289b24fb699c572172316001bc571628ceeb8d0595d70
 DIST plantuml-1.2022.3.tar.gz 5399905 BLAKE2B 6dc48de057850a797de779c02e039abb3070239f2e7a907a1447b0a95ef3a869424e10fe5efd3e130f0f8042b40f07209e844677299363a010b0d7ee5727a7d2 SHA512 c90cc11686bff42f56ed35de90eb29a5bcb662c4d0003132b64f9913dff3caa52aed39ca269e2f42b45945a9cbe4713f8717c89af6a6ccd163fcbdf887e275fa
 DIST plantuml-1.2022.4.tar.gz 5400187 BLAKE2B 4fba7454c0e3f757afa757b4be27bd4878a516f981209c69350adaeb21b7e051323477da496aff18b41f001fc0f2ebc2368daf14aa55957fd5ae426275494371 SHA512 b4520d304b2d4893687d18438af38bd8c2639b3dde5cd5cf3bd6c2426efa4e022081e02d396dde96253ddafd48f488676ca76e2d124b00e61435b8d3ea9f16a2
diff --git a/media-gfx/plantuml/plantuml-1.2022.1.ebuild b/media-gfx/plantuml/plantuml-1.2022.1.ebuild
deleted file mode 100644
index 8ba5d39fd289..000000000000
--- a/media-gfx/plantuml/plantuml-1.2022.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 desktop xdg
-
-DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
-HOMEPAGE="https://plantuml.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	dev-java/ant-core:0
-	media-gfx/graphviz"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	use source && java-pkg_dosrc src/*
-
-	make_desktop_entry plantuml PlantUML
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2d52364e217b..712272101544 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 87a254e201c3..8a397225e639 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1 +1,2 @@
 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
+DIST ilmbase-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
diff --git a/media-libs/ilmbase/ilmbase-2.5.8.ebuild b/media-libs/ilmbase/ilmbase-2.5.8.ebuild
new file mode 100644
index 000000000000..04019509e220
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!media-libs/openexr:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md )
+
+src_prepare() {
+	if use abi_x86_32 && use test; then
+		eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
+	fi
+
+	multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DILMBASE_INSTALL_PKG_CONFIG=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index ccb9398d7ade..a8f892c05517 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,2 +1 @@
-DIST libtgvoip-2.4.4_p20211129.tar.gz 1098091 BLAKE2B 20d90b10a2f87d05fdb5bf723e87045262cfa06a33a0543a9a73e946f44d7017e04faeba19a13d20ab531c4c335d234c172d0cc93819b35477a990cfcb87dab3 SHA512 e55f05e5459e453d33ff717b928324c39adcb0ab2e6aaefa0f2deb35ca76c956ffc723d7138964a3bc10a7bc1e3bc66360ff8c55a080eb3210f5728542ec7d96
 DIST libtgvoip-2.4.4_p20220117.tar.gz 1098045 BLAKE2B 752b3b26f511316b8261d9ebb833e2b74df91377daca255fbbeefb18b3ab3811b97eaee1d9965e95ed9d215467e6ff5dc857369d381d470570cb87c3bfec33af SHA512 b9d8e354e9b8f9226d5e06397fdf3c91f71fee890db7d180dffae2e3fb6f74bca1c31b7f87049257c3edf44c2171780ed5781877cf8f2d40b2d56c1f5385ef77
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
deleted file mode 100644
index 8c2c2aee32a2..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="VoIP library for Telegram clients"
-HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
-
-LIBTGVOIP_COMMIT="2cffda6222f07cd7d0aa4627a06fa99b05a3956d"
-SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dsp +alsa pulseaudio"
-
-DEPEND="
-	dev-libs/openssl:=
-	media-libs/opus
-	alsa? ( media-libs/alsa-lib )
-	dsp? ( media-libs/tg_owt:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-"
-
-src_prepare() {
-	# Will be controlled by us
-	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
-	# https://bugs.gentoo.org/717210
-	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-dsp  # WebRTC is linked from tg_owt
-		$(use_with alsa)
-		$(use_with pulseaudio pulse)
-	)
-	if use dsp; then
-		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt"
-		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt/third_party/abseil-cpp"
-		append-libs '-ltg_owt'
-	else
-		append-cppflags '-DTGVOIP_NO_DSP'
-	fi
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 39b88ea65170..5721a781b067 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,2 +1,3 @@
 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
+DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
new file mode 100644
index 000000000000..50fc19f16ab7
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/OpenEXR"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( PATENTS README.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+	# disable failing tests on various arches
+	if use test; then
+		if use abi_x86_32; then
+			eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
+		fi
+
+		# Technically this doesn't disable anything, it just gives this test time to complete.
+		# Could probably be applied unconditionally but will leave this to the maintainers.
+		if use riscv; then
+			eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
+		fi
+
+		if use sparc; then
+			eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
+		fi
+	fi
+
+	multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DINSTALL_OPENEXR_DOCS=$(usex doc)
+		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DOPENEXR_BUILD_UTILS=$(usex utils)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		DOCS+=( doc/*.pdf )
+	fi
+	einstalldocs
+
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index ea5cf3b09d6a..342b3ec53144 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,3 +1,2 @@
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20211207.tar.gz 16780636 BLAKE2B bfa35a43b2085b897eb16986ecfb79ece5f8076d88572869580716014a564023dbc156b1d0885685bf04c57e34f26870dde497e8aae9889e5b2eed6d9a012d8e SHA512 7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90
 DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9 SHA512 0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch
deleted file mode 100644
index 9cc55585a561..000000000000
--- a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix an issue with -DTG_OWT_USE_PIPEWIRE=OFF
-
-Some files were erroneously being included despite the option being turned off
-
---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
-@@ -88,6 +88,7 @@
- init_target(tg_owt)
- 
- if (TG_OWT_USE_PIPEWIRE)
-+    link_glib(tg_owt)
-     if (TG_OWT_DLOPEN_PIPEWIRE)
-         include(cmake/generate_stubs.cmake)
-         set(stubs_loc ${webrtc_loc}/modules/desktop_capture/linux)
-@@ -169,7 +170,6 @@
- 
- if (UNIX AND NOT APPLE)
-     link_x11(tg_owt)
--    link_glib(tg_owt)
- endif()
- 
- function(add_sublibrary postfix)
-@@ -2161,6 +2161,13 @@
-     )
- endif()
- 
-+if (NOT TG_OWT_USE_PIPEWIRE)
-+    remove_target_sources(tg_owt ${webrtc_loc}
-+        modules/desktop_capture/linux/base_capturer_pipewire.cc
-+        modules/desktop_capture/linux/base_capturer_pipewire.h
-+    )
-+endif()
-+
- if (NOT TG_OWT_BUILD_AUDIO_BACKENDS)
-     remove_target_sources(tg_owt ${webrtc_loc}
-         rtc_base/win/windows_version.cc
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch
deleted file mode 100644
index 0bddb5fd00f6..000000000000
--- a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Add support for -DTG_OWT_BUILD_PULSE_BACKEND
-
-This is based off of the rtc_include_pulse_audio option in:
-* src/modules/audio_device/BUILD.gn
-
-ALSA must be enabled unless audio support is removed as a whole, see:
-* src/modules/audio_device/audio_device_impl.cc
-
---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
-@@ -25,12 +25,17 @@
- option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON)
- option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build})
- option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON)
-+option(TG_OWT_BUILD_PULSE_BACKEND "Build pulseaudio audio backend on non-Apple Unix." ON)
- 
- if (NOT UNIX OR APPLE)
-     set(TG_OWT_USE_X11 OFF)
-     set(TG_OWT_USE_PIPEWIRE OFF)
- endif()
- 
-+if (NOT TG_OWT_BUILD_AUDIO_BACKENDS)
-+    set(TG_OWT_BUILD_PULSE_BACKEND OFF)
-+endif()
-+
- if (BUILD_SHARED_LIBS)
-     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- endif()
-@@ -162,9 +167,11 @@
- link_libvpx(tg_owt)
- 
- if (TG_OWT_BUILD_AUDIO_BACKENDS AND (UNIX AND NOT APPLE))
--    link_libalsa(tg_owt)
--    link_libpulse(tg_owt)
-     link_dl(tg_owt)
-+    link_libalsa(tg_owt)
-+    if (TG_OWT_BUILD_PULSE_BACKEND)
-+        link_libpulse(tg_owt)
-+    endif()
- endif()
- 
- if (NOT WIN32 AND NOT APPLE)
-@@ -2218,12 +2225,6 @@
-         modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
-         modules/audio_device/linux/latebindingsymboltable_linux.cc
-         modules/audio_device/linux/latebindingsymboltable_linux.h
--        modules/audio_device/linux/audio_device_pulse_linux.cc
--        modules/audio_device/linux/audio_device_pulse_linux.h
--        modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
--        modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
--        modules/audio_device/linux/pulseaudiosymboltable_linux.cc
--        modules/audio_device/linux/pulseaudiosymboltable_linux.h
-         modules/audio_device/mac/audio_device_mac.cc
-         modules/audio_device/mac/audio_device_mac.h
-         modules/audio_device/mac/audio_mixer_manager_mac.cc
-@@ -2243,6 +2244,17 @@
-     )
- endif()
- 
-+if (NOT TG_OWT_BUILD_PULSE_BACKEND)
-+    remove_target_sources(tg_owt ${webrtc_loc}
-+        modules/audio_device/linux/audio_device_pulse_linux.cc
-+        modules/audio_device/linux/audio_device_pulse_linux.h
-+        modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
-+        modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
-+        modules/audio_device/linux/pulseaudiosymboltable_linux.cc
-+        modules/audio_device/linux/pulseaudiosymboltable_linux.h
-+    )
-+endif()
-+
- if (NOT WIN32)
-     remove_target_sources(tg_owt ${webrtc_loc}
-         rtc_base/win32.cc
---- tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/cmake/libwebrtcbuild.cmake
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/cmake/libwebrtcbuild.cmake
-@@ -50,8 +50,13 @@
-     target_compile_definitions(libwebrtcbuild
-     INTERFACE
-         WEBRTC_ENABLE_LINUX_ALSA
--        WEBRTC_ENABLE_LINUX_PULSE
-     )
-+    if (TG_OWT_BUILD_PULSE_BACKEND)
-+        target_compile_definitions(libwebrtcbuild
-+        INTERFACE
-+            WEBRTC_ENABLE_LINUX_PULSE
-+        )
-+    endif()
- endif()
- 
- if (WIN32)
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch b/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch
deleted file mode 100644
index 0abb3cfb4a37..000000000000
--- a/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Add -DTG_OWT_USE_X11
-
-Allows disabling X11 desktop capturing independently of pipewire support, for
-the few people that run wayland without any X11 support whatsoever.
-
-This setup is untested, but supported by the GNI build system, see:
-* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions)
-
-Toggling the WEBRTC_USE_X11 define also affects some files under
-src/modules/audio_device, but that falls under "X11 support", regardless...
-
---- tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.orig/CMakeLists.txt
-+++ tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589/CMakeLists.txt
-@@ -21,11 +21,13 @@
- 
- option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." ${TG_OWT_PACKAGED_BUILD})
- option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS})
-+option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON)
- option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON)
- option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build})
- option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON)
- 
- if (NOT UNIX OR APPLE)
-+    set(TG_OWT_USE_X11 OFF)
-     set(TG_OWT_USE_PIPEWIRE OFF)
- endif()
- 
-@@ -84,6 +86,10 @@
- add_library(tg_owt)
- init_target(tg_owt)
- 
-+if (TG_OWT_USE_X11)
-+    link_x11(tg_owt)
-+endif()
-+
- if (TG_OWT_USE_PIPEWIRE)
-     link_glib(tg_owt)
-     if (TG_OWT_DLOPEN_PIPEWIRE)
-@@ -161,10 +167,6 @@
- include(cmake/libwebrtcbuild.cmake)
- target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
- 
--if (UNIX AND NOT APPLE)
--    link_x11(tg_owt)
--endif()
--
- function(add_sublibrary postfix)
-     add_library(tg_owt_${postfix} OBJECT)
-     init_feature_target(tg_owt_${postfix} ${postfix})
-@@ -2204,6 +2206,37 @@
-     )
- endif()
- 
-+if (NOT TG_OWT_USE_X11)
-+    remove_target_sources(tg_owt ${webrtc_loc}
-+        modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc
-+        modules/desktop_capture/linux/mouse_cursor_monitor_x11.h
-+        modules/desktop_capture/linux/screen_capturer_x11.cc
-+        modules/desktop_capture/linux/screen_capturer_x11.h
-+        modules/desktop_capture/linux/shared_x_display.cc
-+        modules/desktop_capture/linux/shared_x_display.h
-+        modules/desktop_capture/linux/window_capturer_x11.cc
-+        modules/desktop_capture/linux/window_capturer_x11.h
-+        modules/desktop_capture/linux/window_finder_x11.cc
-+        modules/desktop_capture/linux/window_finder_x11.h
-+        modules/desktop_capture/linux/window_list_utils.cc
-+        modules/desktop_capture/linux/window_list_utils.h
-+        modules/desktop_capture/linux/x_atom_cache.cc
-+        modules/desktop_capture/linux/x_atom_cache.h
-+        modules/desktop_capture/linux/x_error_trap.cc
-+        modules/desktop_capture/linux/x_error_trap.h
-+        modules/desktop_capture/linux/x_server_pixel_buffer.cc
-+        modules/desktop_capture/linux/x_server_pixel_buffer.h
-+        modules/desktop_capture/linux/x_window_property.cc
-+        modules/desktop_capture/linux/x_window_property.h
-+
-+        modules/desktop_capture/screen_drawer.cc
-+        modules/desktop_capture/screen_drawer.h
-+        modules/desktop_capture/screen_drawer_linux.cc
-+        modules/desktop_capture/screen_drawer_lock_posix.cc
-+        modules/desktop_capture/screen_drawer_lock_posix.h
-+    )
-+endif()
-+
- if (NOT TG_OWT_USE_PIPEWIRE)
-     remove_target_sources(tg_owt ${webrtc_loc}
-         modules/desktop_capture/linux/base_capturer_pipewire.cc
---- tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.orig/cmake/libwebrtcbuild.cmake
-+++ tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589/cmake/libwebrtcbuild.cmake
-@@ -28,6 +28,13 @@
-     BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0
- )
- 
-+if (TG_OWT_USE_X11)
-+    target_compile_definitions(libwebrtcbuild
-+    INTERFACE
-+        WEBRTC_USE_X11
-+    )
-+endif()
-+
- if (TG_OWT_USE_PIPEWIRE)
-     target_compile_definitions(libwebrtcbuild
-     INTERFACE
-@@ -64,11 +71,6 @@
-         INTERFACE
-             WEBRTC_MAC
-         )
--    else()
--        target_compile_definitions(libwebrtcbuild
--        INTERFACE
--            WEBRTC_USE_X11
--        )
-     endif()
- 
-     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild b/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
deleted file mode 100644
index a1476f496136..000000000000
--- a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt"
-
-TG_OWT_COMMIT="d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589"
-LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
-SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz
-
-LICENSE="BSD"
-SLOT="0/${PV##*pre}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="screencast +X"
-
-# This package's USE flags may change the ABI and require a rebuild of
-#  dependent pacakges. As such, one should make sure to depend on
-#  media-libs/tg_owt[x=,y=,z=] for any package that uses this.
-
-# Bundled libs:
-# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
-# - libsrtp (project uses private APIs)
-# - pffft (no stable versioning, patched)
-# media-libs/libjpeg-turbo is required for libyuv
-DEPEND="
-	dev-cpp/abseil-cpp:=[cxx17(+)]
-	dev-libs/libevent:=
-	dev-libs/openssl:=
-	dev-libs/protobuf:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libvpx-1.10.0:=
-	media-libs/openh264:=
-	media-libs/opus
-	media-video/ffmpeg:=
-	net-libs/usrsctp
-	screencast? (
-		dev-libs/glib:2
-		media-video/pipewire:=
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pipewire.patch"
-	"${FILESDIR}/tg_owt-0_pre20211207-allow-disabling-X11.patch"
-	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch"
-	"${FILESDIR}/tg_owt-0_pre20211207-fix-dcsctp-references.patch"
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}/src/third_party/libyuv" || die
-	unpack "libyuv-${LIBYUV_COMMIT}.tar.gz"
-}
-
-src_prepare() {
-	# libvpx source files aren't included in the repository
-	sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die
-
-	# libopenh264 has GENERATED files with yasm that aren't excluded by
-	# EXCLUDE_FROM_ALL, and I have no clue how to avoid this.
-	# These source files aren't used with system-openh264, anyway.
-	sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
-	# see https://bugs.gentoo.org/754012
-	# EAPI 8 still wipes this flag.
-	append-cppflags '-DNDEBUG'
-
-	local mycmakeargs=(
-		-DTG_OWT_USE_X11=$(usex X)
-		-DTG_OWT_USE_PIPEWIRE=$(usex screencast)
-
-		# Not required by net-im/telegram-desktop right now, I'd rather avoid
-		#  the (ABI compatibility) headache.
-		-DTG_OWT_BUILD_AUDIO_BACKENDS=OFF
-		#-DTG_OWT_BUILD_AUDIO_BACKENDS=$(usex alsa)
-		#-DTG_OWT_BUILD_PULSE_BACKEND=$(usex pulseaudio)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Save about 15MB of useless headers
-	rm -r "${ED}/usr/include/tg_owt/rtc_base/third_party" || die
-	rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die
-	rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die
-	rm -r "${ED}/usr/include/tg_owt/third_party" || die
-
-	# Install a few headers anyway, as required by net-im/telegram-desktop...
-	local headers=(
-		third_party/libyuv/include
-		rtc_base/third_party/sigslot
-		rtc_base/third_party/base64
-	)
-	for dir in "${headers[@]}"; do
-		pushd "${S}/src/${dir}" > /dev/null || die
-		find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die
-		popd > /dev/null || die
-	done
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index ad42a3058121..30bdb317bc53 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
index 09e46e9788f0..3124530b8bd4 100644
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,9 @@ src_prepare() {
 	append-cxxflags -std=gnu++11
 	eapply -p0 "${FILESDIR}"/${PN}-3.5-tinfo.patch \
 		"${FILESDIR}"/${PN}-tests.patch
+	# Bug# 837617
+	sed -i -e "s/curses, initscr/ncurses, initscr/" \
+		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
 	eapply_user
 	eautoreconf
 }
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1c7cd813115d..0368ffdb13ec 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index b8d4070c3505..f33b6865737c 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,4 +1,3 @@
-DIST abcMIDI-2022.02.21.zip 609368 BLAKE2B 0608d9539d0a66f739a820693c5a9884d1b39b68e4bcd3d21ce020ef240de6e19eacb52bc35ed7a9d4c4fde47e6265c415cf4d80711853904ccdc1ffd752cefe SHA512 515c6ebef75a5b0592578dab6f5d940ed5e25811dd66f15f85ebb1e6fdd7bcbcffdd4d361e0f16a78144323fac14a0cbd1a7ed6b14c7039e2d48986d40765171
 DIST abcMIDI-2022.03.08.zip 609510 BLAKE2B 231eb517a2d47993ed39e509d377d14ec2311fe49128bf559799ea1fabd3ba79c69307f2d7b9d44fec2279e42d0575141088463ca96aa0f9dda5bbecc305a92b SHA512 3267bcecad586e0aadc5fbc2801c0c992ba765094fdf5d3b71a8634f4433a950c64b0c863bec496bd21f8a630c0e768cbc39d50d58e6cf9d2769a66bf265a8c7
 DIST abcMIDI-2022.03.20.zip 609912 BLAKE2B 8972f6944897d49c1281be9d9b1368278d62fcbfc909651d1fb1347d3efef4ab145f049bac05e11f09118548e9c3c3a753f9367c9e90d933af96e74b71bd6b19 SHA512 138480f0d2a36b573e63a9214d7e2e2109a3e6b55e94999376a333da1978fea0addb5359b0d469d801924d6e039b0eb164a28a9cfad02d73cba1069a29dbfc9b
 DIST abcMIDI-2022.04.06.zip 609956 BLAKE2B c140bcacc94d8e6193ba6220c1747861a11d79e5b394ff5826edfdb3029e57b3a6d9443a557baf6279d4a7c9e6488dcb2c8d0e6a05858046be53fc52be2640bd SHA512 06d4ddfc4f7bbc1906604629e3b2ca7ebf8d2f89edb478d2068b2ba4efab6ff1d96aeebd6344ea2ebc7a92c23cf49d08b40bc97c47458e526d505313fb52a527
diff --git a/media-sound/abcmidi/abcmidi-2022.02.21.ebuild b/media-sound/abcmidi/abcmidi-2022.02.21.ebuild
deleted file mode 100644
index 3b11050a4f44..000000000000
--- a/media-sound/abcmidi/abcmidi-2022.02.21.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
index 980e54d18196..132c0bc203e2 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
index ce2c5001509b..0edb6f31cd7f 100644
--- a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86"
 
 # IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
 # flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ade3d78b3d8a..217ac32a7fa4 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
new file mode 100644
index 000000000000..5b9ad3cf2d7c
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
@@ -0,0 +1,39 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch
+https://bugs.gentoo.org/838427
+
+From: psykose <alice@ayaya.dev>
+Date: Wed, 13 Apr 2022 21:57:49 +0000
+Subject: [PATCH] spa: fix c90 header include
+
+placing declarations after code is invalid under ISO c90
+
+Fixes !1211
+--- a/spa/include/spa/utils/string.h
++++ b/spa/include/spa/utils/string.h
+@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
+ static inline float spa_strtof(const char *str, char **endptr)
+ {
+ 	static locale_t locale = NULL;
++	locale_t prev;
+ 	float v;
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+-	locale_t prev = uselocale(locale);
++	prev = uselocale(locale);
+ 	v = strtof(str, endptr);
+ 	uselocale(prev);
+ 	return v;
+@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
+ static inline double spa_strtod(const char *str, char **endptr)
+ {
+ 	static locale_t locale = NULL;
++	locale_t prev;
+ 	double v;
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+-	locale_t prev = uselocale(locale);
++	prev = uselocale(locale);
+ 	v = strtod(str, endptr);
+ 	uselocale(prev);
+ 	return v;
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.50.ebuild b/media-video/pipewire/pipewire-0.3.50-r1.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.50.ebuild
rename to media-video/pipewire/pipewire-0.3.50-r1.ebuild
index 6a066b48013e..486d6073c4d1 100644
--- a/media-video/pipewire/pipewire-0.3.50.ebuild
+++ b/media-video/pipewire/pipewire-0.3.50-r1.ebuild
@@ -124,6 +124,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${P}-fix-spa-header.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5377c48e68e1..9db37a3b0dbe 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 2252152b5d52..566f83262d90 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Apr 2022 05:39:21 +0000
+Fri, 15 Apr 2022 09:39:21 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2252152b5d52..566f83262d90 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Apr 2022 05:39:21 +0000
+Fri, 15 Apr 2022 09:39:21 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1312ad924492..d247893ddecc 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 1e6595c9faf7..8b4bac62d38f 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.22.96 b/metadata/md5-cache/app-admin/awscli-1.22.96
new file mode 100644
index 000000000000..b025591ed0b2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.22.96
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.24.41[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.4.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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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://pypi.org/project/awscli/
+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.24.41[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.4.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.22.96.tar.gz -> awscli-1.22.96.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=59519942ae5dec05b6326b5ab95639f7
diff --git a/metadata/md5-cache/app-admin/doas-6.8.2 b/metadata/md5-cache/app-admin/doas-6.8.2
new file mode 100644
index 000000000000..3d79e48cd9c9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/doas-6.8.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/yacc
+DEFINED_PHASES=configure postinst
+DEPEND=pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
+DESCRIPTION=Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
+EAPI=8
+HOMEPAGE=https://github.com/Duncaen/OpenDoas
+IUSE=pam persist
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=ISC
+RDEPEND=pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
+SLOT=0
+SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.8.2.tar.gz -> OpenDoas-6.8.2.tar.gz
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=07178f52e05bc987889ed309cb711815
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 8d6f541df795..5bc9259115ae 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0
index 2fdf0e9bb522..b6d8e45d1c9e 100644
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.5.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-
 DESCRIPTION=Qt GUI File Archiver
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.5.0/lxqt-archiver-0.5.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=941ed77ffe22f54bf43ad6e83c90bc0e
+_md5_=f45d1cbcbdbe4894d688b87381be1766
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 1169dbfa73ab..839ec7468c21 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/auto-multiple-choice-1.3.0-r1 b/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
index 54fc327c6677..53bc6463737a 100644
--- a/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
+++ b/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-text/texlive[extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/dblatex app-text/docbook-xml-simple-dtd:* app-text/docbook-xsl-stylesheets virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=app-text/texlive[extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/dblatex app-text/docbook-xml-simple-dtd:* app-text/docbook-xsl-stylesheets
 DESCRIPTION=Create and manage multiple choice questionnaries, including automated marking
 EAPI=7
 HOMEPAGE=http://www.auto-multiple-choice.net/
@@ -9,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-text/texlive[extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/pdftk dev-lang/perl:= dev-perl/Glib-Object-Introspection dev-perl/Gtk2 dev-perl/Gtk2-Notify media-gfx/imagemagick dev-perl/XML-Writer dev-perl/Archive-Zip dev-perl/DBI dev-perl/Text-CSV dev-perl/DBD-SQLite dev-perl/Net-CUPS dev-perl/Email-Address dev-perl/Email-MIME dev-perl/Email-Sender virtual/latex-base
 SLOT=0
 SRC_URI=http://download.auto-multiple-choice.net/auto-multiple-choice_1.3.0_sources.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=baec80605e01cc2976ece9a15655ef9e
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index dd336cb9267e..b24bf1e0f451 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
new file mode 100644
index 000000000000..2c07b73f6272
--- /dev/null
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Gentoo specific zsh completion support (includes emerge and ebuild commands)
+EAPI=8
+HOMEPAGE=https://github.com/gentoo/gentoo-zsh-completions
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris
+LICENSE=ZSH
+RDEPEND=>=app-shells/zsh-4.3.5
+SLOT=0
+SRC_URI=https://github.com/gentoo/gentoo-zsh-completions/archive/20220112.tar.gz -> gentoo-zsh-completions-20220112.tar.gz
+_md5_=86d4fb29f337de40a6854c2a6fa9a66f
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
index b11434fa5009..70958b51df97 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
@@ -1,11 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Gentoo specific zsh completion support (includes emerge and ebuild commands)
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/gentoo/gentoo-zsh-completions
 LICENSE=ZSH
 PROPERTIES=live
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53
-_md5_=6e4e238e603bcd42ed2962c5ce90f367
+_md5_=86d4fb29f337de40a6854c2a6fa9a66f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8dc3138bba65..2b60c0a72b36 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
index 5ef3383d0f19..fbaa3bb82253 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex virtual/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex virtual/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base )
 DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
 EAPI=7
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
-_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	223c086dd062dba43b89726880f9f0c2	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=66c0c6261850b64fa14be1a728a2ad31
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 3fdf271c7a2e..5eba01ecf39c 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/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 995cd50ac7a8..2d26e273aa98 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=java library for writing localized messages using resource bundle
 EAPI=8
 HOMEPAGE=http://cal10n.qos.ch/
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=f213a84f4868bef80820bc3e457bc62e
+_md5_=0660b455429dbdf902b31d8f1befb67c
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r1 b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
deleted file mode 100644
index 3e6a33d3e499..000000000000
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Jacl is an implementation of Tcl written in Java
-EAPI=5
-HOMEPAGE=http://tcljava.sourceforge.net
-IUSE=doc doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/tcljava/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1797ae099c5bce7e9ffcf803859d65fb
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
index 1a61820bba65..b145edfcdaf2 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Jacl is an implementation of Tcl written in Java
 EAPI=8
 HOMEPAGE=http://tcljava.sourceforge.net
 IUSE=doc doc source
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=5c3da2f032451054bb01050c8ccc6443
+_md5_=2b2f769227fc69a612651c02ccdd38b5
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
index 2486a867ebc2..6ed3473f9999 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A XSLT and XQuery Processor
 EAPI=8
 HOMEPAGE=http://saxon.sourceforge.net/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=MPL-1.0
 RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c1fc566d278610d2772250e9311e6584
+_md5_=272f2fee3fc1af7463a48c9f9f1227d0
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.36 b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
index 40a137432964..8b30d5f26f19 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
@@ -5,11 +5,11 @@ DESCRIPTION=The slf4j API
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=a55bc1f081e717b2da5380f229128230
+_md5_=338f4e479d80a739f05e04a17f5dfd25
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
index fa7313c431e1..2479e9f657ec 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
@@ -4,10 +4,10 @@ DESCRIPTION=Extensions to the SLF4J API
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/commons-lang:2.1 dev-java/javassist:3 ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=1f49ecad0bec3474906d64a1f7c9b0ee
+_md5_=10ce5b7c3440e8afa5c532cf009b1588
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.36 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
index f1411e1adccb..888422636a2c 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
@@ -4,11 +4,11 @@ DESCRIPTION=SLF4J NOP Binding
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=fcb166ba2d4eee0fe2eaeb93a784da58
+_md5_=3e3bf4e30cff976cd3b3aa2ec11881d2
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.36 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
index 55e495aa573c..55537dc09341 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
@@ -4,11 +4,11 @@ DESCRIPTION=SLF4J Simple binding
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=57677fa0e21f34bef8102f1cd7de6423
+_md5_=b11f579dd89a57a61786c3acc4558cd6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
index 6dbdd251a90c..00ac662170be 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.18/src/apache-tomcat-10.0.18-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=484ed8723ef13a21c7a8ed2078e7409b
+_md5_=6328ad36d00166afe8720254a620be3b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
index a882f88ce5b9..a70fc27084c3 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.77/src/apache-tomcat-8.5.77-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=ab5d48ecbb7dcf4732f97868224457ca
+_md5_=1d17f60281b85eedf2cae095373baeca
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
index 0e5029b16e54..fff0e76ac7b3 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.60/src/apache-tomcat-9.0.60-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=08ded5a97f72bfd8d150c726103afe2f
+_md5_=2e1c0367bb158cb4746a9296639c4a13
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.2.8 b/metadata/md5-cache/dev-java/woodstox-core-6.2.8
index 27fe916dd1b2..7a79ce04d81c 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.2.8
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs
 EAPI=8
 HOMEPAGE=https://github.com/FasterXML/woodstox
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.2.8.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=c5a39351ece348d1fcea3d6c298ca0d4
+_md5_=f18e632565e89e8de10ef603cc74872b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index dc9c0eb8a688..b331912e0f03 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/ruby-2.6.10 b/metadata/md5-cache/dev-lang/ruby-2.6.10
index 170c1aa92ab6..070b5d2ea9a3 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.6.10
+++ b/metadata/md5-cache/dev-lang/ruby-2.6.10
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] virtual/rubygems[ruby_targets_ruby26] >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] >=dev-ruby/json-2.0.2[ruby_targets_ruby26] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20181225
 SLOT=2.6
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.10.tar.xz
 _eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b3b4dcdcc15603d8568f40ea201e7bae
+_md5_=58de444affb6fb5da62a4742ebd1c9fd
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.6 b/metadata/md5-cache/dev-lang/ruby-2.7.6
index e277ef465399..ddf4e4cd593a 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.7.6
+++ b/metadata/md5-cache/dev-lang/ruby-2.7.6
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
 SLOT=2.7
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.6.tar.xz
 _eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e91be21ed3a73797fce83448127ef934
+_md5_=c0a8c388e1a64c7eb50dc9df7bac6422
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e58b593e72c9..990202a4c400 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/boost-1.79.0 b/metadata/md5-cache/dev-libs/boost-1.79.0
new file mode 100644
index 000000000000..af827bdc8fba
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.79.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/boost-build-1.78.0-r1
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 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(-)?] ) icu? ( >=dev-libs/icu-3.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(-)?] ) !icu? ( virtual/libiconv[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(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) 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 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Boost Libraries for C++
+EAPI=8
+HOMEPAGE=https://www.boost.org/
+IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Boost-1.0
+RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 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(-)?] ) icu? ( >=dev-libs/icu-3.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(-)?] ) !icu? ( virtual/libiconv[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(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) 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 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=test
+SLOT=0/1.79.0
+SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e7ac8596d72e11f3567087ece49d552c
diff --git a/metadata/md5-cache/dev-libs/glib-2.72.1 b/metadata/md5-cache/dev-libs/glib-2.72.1
new file mode 100644
index 000000000000..a3af62a1d223
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/glib-2.72.1
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] >=dev-lang/python-3.9.9-r1:3.9[xml] >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!<dev-util/gdbus-codegen-2.72.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=The GLib library of C routines
+EAPI=7
+HOMEPAGE=https://www.gtk.org/
+IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
+RDEPEND=!<dev-util/gdbus-codegen-2.72.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=gtk-doc? ( test )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.1.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	8b7b99d1e4401a7a903cdfe1d2bf29de	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ba6b50b406f38ef38489b3f714401d54
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.8.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.8.0
index 8da6a1bbac5f..1add0f381158 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.8.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Implementation of XDG Standards
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
 IUSE=test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5= >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtxml-5.15:5 x11-misc/xdg-utils
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.8.0/libqtxdg-3.8.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5153813285389df48de8b38a7ca460a3
+_md5_=ac037df588ad0c96db3ed71e06166d20
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816 b/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
index da970d971c9a..721e5dc9aea6 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
+++ b/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
@@ -5,7 +5,7 @@ DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=7
 HOMEPAGE=https://pagure.io/newt
 IUSE=gpm nls tcl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 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 ) >=dev-libs/popt-1.6 =sys-libs/slang-2* gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mlichvar/newt/archive/a7533580cd092e6a71c4ed722e830da4eb884d06.tar.gz -> newt-0.52.21_p20210816.tar.gz
 _eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c727ea4e3849c392ab6ccf389b7757ad
+_md5_=06c4a3da57e969954520aa7f94b1a861
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index e41dd423e274..9db452e89e65 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.41-r1 b/metadata/md5-cache/dev-ml/ocamlweb-1.41-r1
index 771ba08881c4..20f5b5574cae 100644
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.41-r1
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.41-r1
@@ -1,6 +1,6 @@
-BDEPEND=test? ( dev-tex/hevea )
+BDEPEND=test? ( dev-tex/hevea ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexextra
 DESCRIPTION=O'Caml literate programming tool
 EAPI=7
 HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexex
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.41.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=8eafdb70d661fd008ee2b0de2c0c630d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 45335d5cb8a1..c1ad355abb91 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/boto3-1.21.41 b/metadata/md5-cache/dev-python/boto3-1.21.41
new file mode 100644
index 000000000000..c1acf618bbfd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.21.41
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[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(-)?] ) doc? ( || ( ( >=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.24.41[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.24.41[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.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=https://github.com/boto/boto3/archive/1.21.41.tar.gz -> boto3-1.21.41.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=f966ebe9df6fff0831935a36f567d975
diff --git a/metadata/md5-cache/dev-python/botocore-1.24.41 b/metadata/md5-cache/dev-python/botocore-1.24.41
new file mode 100644
index 000000000000..8f6a2cbddec6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.24.41
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[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(-)?] ) doc? ( || ( ( >=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(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[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/b/botocore/botocore-1.24.41.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=12e01d8381058d6686b535919c01bc8c
diff --git a/metadata/md5-cache/dev-python/cmd2-2.4.1 b/metadata/md5-cache/dev-python/cmd2-2.4.1
new file mode 100644
index 000000000000..27a3d07a6072
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cmd2-2.4.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/which || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[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/wcwidth[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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extra features for standard library's cmd module
+EAPI=8
+HOMEPAGE=https://github.com/python-cmd2/cmd2
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[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/wcwidth[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? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cmd2/cmd2-2.4.1.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=4c8ce4949f6828c5493118f5addaf808
diff --git a/metadata/md5-cache/dev-python/flask-2.0.3 b/metadata/md5-cache/dev-python/flask-2.0.3
index 8c5eb7e7a0b9..5e80ff34fbba 100644
--- a/metadata/md5-cache/dev-python/flask-2.0.3
+++ b/metadata/md5-cache/dev-python/flask-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
 EAPI=8
 HOMEPAGE=https://github.com/pallets/flask/
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/werkzeug-2.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-2.0.3.tar.gz
 _eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e7d29164683f944fb2a14581f5ca034d
+_md5_=1aace122ba696b22e5d690f4916ec6b4
diff --git a/metadata/md5-cache/dev-python/gpep517-3 b/metadata/md5-cache/dev-python/gpep517-3
index 855e51db2721..1050acaa5d78 100644
--- a/metadata/md5-cache/dev-python/gpep517-3
+++ b/metadata/md5-cache/dev-python/gpep517-3
@@ -4,7 +4,7 @@ DESCRIPTION=A backend script to aid installing Python packages in Gentoo
 EAPI=7
 HOMEPAGE=https://pypi.org/project/gpep517/ https://github.com/mgorny/gpep517/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/installer-0.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.3[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gpep517/archive/v3.tar.gz -> gpep517-3.gh.tar.gz
 _eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5725b7d0c30f84e19eed1044cd36ced2
+_md5_=88c769ad7d47baaf74fece4c26086e37
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.43.1 b/metadata/md5-cache/dev-python/hypothesis-6.43.1
new file mode 100644
index 000000000000..c8d05c55eeec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.43.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[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(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_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] ) >=dev-python/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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(-)?]
+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/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.43.1.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=8139ae31a1729a0f6389d33351515d6b
diff --git a/metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.7 b/metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.7
new file mode 100644
index 000000000000..f247627b6f52
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( media-video/ffmpeg:* >=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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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=FFMPEG wrapper for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/imageio-ffmpeg/ https://github.com/imageio/imageio-ffmpeg
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD-2
+PROPERTIES=test_network
+RDEPEND=media-video/ffmpeg:* 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=https://github.com/imageio/imageio-ffmpeg/archive/v0.4.7.tar.gz -> imageio-ffmpeg-0.4.7.gh.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=ad1a0a65c152a92ef1b3daa3f6ef4496
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.7.0 b/metadata/md5-cache/dev-python/importlib_resources-5.7.0
new file mode 100644
index 000000000000..402755fa35b3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[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 ) >=dev-python/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/tomli-1.2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read resources from Python packages
+EAPI=7
+HOMEPAGE=https://github.com/python/importlib_resources
+IUSE=test doc python_targets_pypy3 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) 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 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.7.0.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=96e1b2c03defc6022a26f33336a5267f
diff --git a/metadata/md5-cache/dev-python/jupyter-1.0.0-r4 b/metadata/md5-cache/dev-python/jupyter-1.0.0-r4
index 82afd1173431..c279108127cf 100644
--- a/metadata/md5-cache/dev-python/jupyter-1.0.0-r4
+++ b/metadata/md5-cache/dev-python/jupyter-1.0.0-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Jupyter metapackage. Install all the Jupyter components in one go
 EAPI=8
 HOMEPAGE=https://jupyter.org
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 PDEPEND=>=dev-python/jupyter_core-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_console[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbconvert[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/ipywidgets[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 )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter/jupyter-1.0.0.tar.gz https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> jupyter-1.0.0-file-colision.patch
 _eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ea3e2a06120fc46d1b5920d20c94b269
+_md5_=f9d964681706949b4ff42656d0cdcebd
diff --git a/metadata/md5-cache/dev-python/mechanize-0.4.8 b/metadata/md5-cache/dev-python/mechanize-0.4.8
new file mode 100644
index 000000000000..6327c97a222f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mechanize-0.4.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/html5lib-0.999999999[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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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=Stateful programmatic web browsing in Python
+EAPI=8
+HOMEPAGE=https://github.com/python-mechanize/mechanize
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=|| ( BSD ZPL )
+RDEPEND=>=dev-python/html5lib-0.999999999[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/m/mechanize/mechanize-0.4.8.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=61d1710af0cc73d06186ffa63975c5d7
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-2.0.3 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-2.0.3
new file mode 100644
index 000000000000..1cddfc24c69e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-2.0.3
@@ -0,0 +1,14 @@
+BDEPEND=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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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=Custom alterations based on Mkdocs-Material
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/mkdocs_pymdownx_material_extras https://pypi.org/project/mkdocs-pymdownx-material-extras
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mkdocs-material-5.0.2[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 )
+SLOT=0
+SRC_URI=mirror://pypi/m/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=328893b7fc73a747e52c3f4de34b4839
diff --git a/metadata/md5-cache/dev-python/numpydoc-1.2.1 b/metadata/md5-cache/dev-python/numpydoc-1.2.1
new file mode 100644
index 000000000000..7d72919cf248
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpydoc-1.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/matplotlib-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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=Sphinx extension to support docstrings in Numpy format
+EAPI=8
+HOMEPAGE=https://pypi.org/project/numpydoc/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[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/n/numpydoc/numpydoc-1.2.1.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=4e722801deea0421578151f5d4a2fb56
diff --git a/metadata/md5-cache/dev-python/pyfuse3-3.1.1 b/metadata/md5-cache/dev-python/pyfuse3-3.1.1
index b4d8a87423ef..ffc79c8ee87e 100644
--- a/metadata/md5-cache/dev-python/pyfuse3-3.1.1
+++ b/metadata/md5-cache/dev-python/pyfuse3-3.1.1
@@ -11,6 +11,6 @@ RDEPEND=dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/libfuse/pyfuse3/releases/download/release-3.1.1/pyfuse3-3.1.1.tar.gz -> pyfuse3-3.1.1.tar.gz
+SRC_URI=https://github.com/libfuse/pyfuse3/releases/download/release-3.1.1/pyfuse3-3.1.1.tar.gz
 _eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5365d98249704c2daf40060fe6b452c6
+_md5_=68db06efb58dda6a213a941aac498701
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.22 b/metadata/md5-cache/dev-python/pyghmi-1.5.22
deleted file mode 100644
index 32086c7bc38a..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.22
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/coverage-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stestr-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure python implementation of IPMI protocol
-EAPI=7
-HOMEPAGE=https://github.com/openstack/pyghmi/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.22.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a117f6442d7e5806b379bab75bf7c575
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.31 b/metadata/md5-cache/dev-python/pyghmi-1.5.31
deleted file mode 100644
index 8dd674ce9fc6..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.31
+++ /dev/null
@@ -1,15 +0,0 @@
-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/setuptools-42.0.2[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://github.com/openstack-archive/pyghmi/
-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.31.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d57f31fd819cf7e34be634d708a9a2e2
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.32 b/metadata/md5-cache/dev-python/pyghmi-1.5.32
deleted file mode 100644
index 39be4b1c5538..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.32
+++ /dev/null
@@ -1,15 +0,0 @@
-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/setuptools-42.0.2[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://github.com/openstack-archive/pyghmi/
-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.32.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2a7c327a3ddd7717f72abb96bea4de67
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.33 b/metadata/md5-cache/dev-python/pyghmi-1.5.33
deleted file mode 100644
index 4fc302418903..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.33
+++ /dev/null
@@ -1,15 +0,0 @@
-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/setuptools-42.0.2[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://github.com/openstack-archive/pyghmi/
-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.33.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2a7c327a3ddd7717f72abb96bea4de67
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.34 b/metadata/md5-cache/dev-python/pyghmi-1.5.38
similarity index 95%
rename from metadata/md5-cache/dev-python/pyghmi-1.5.34
rename to metadata/md5-cache/dev-python/pyghmi-1.5.38
index 5ea8b7d3ffe0..08dd13ac9b86 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.34
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.38
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A pure python implementation of IPMI protocol
 EAPI=8
-HOMEPAGE=https://github.com/openstack-archive/pyghmi/
+HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -10,6 +10,6 @@ RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_target
 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.34.tar.gz
+SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.38.tar.gz
 _eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=705f66ac087b53a2794f409627d9a573
+_md5_=36e95734eb10967083e1219bef27c4d7
diff --git a/metadata/md5-cache/dev-python/pyopenssl-20.0.1 b/metadata/md5-cache/dev-python/pyopenssl-20.0.1
index 5225222e6732..d0263fd6ae10 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-20.0.1
+++ b/metadata/md5-cache/dev-python/pyopenssl-20.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-20.0.1.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=af18d1e5b8a6248b4e8d5fbb3b464d7b
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0701503312082378d6f7f3c4c45d2107
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
index 3e92623ed031..474b0c672c58 100644
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
+++ b/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
@@ -1,5 +1,6 @@
 BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools-declarative-requirements[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-6.0.0[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/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[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/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[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/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[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/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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 Pytest plugin which implements a few useful skip markers
 EAPI=8
 HOMEPAGE=https://pytest-skip-markers.readthedocs.io/en/latest/ https://github.com/saltstack/pytest-skip-markers
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
@@ -11,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-skip-markers/archive/refs/tags/1.2.0.tar.gz -> pytest-skip-markers-1.2.0.tar.gz
 _eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=831b70d87979cebecc4ef7817cb8120d
+_md5_=3d8fd65322d0068aa350d9d87b9fbbfa
diff --git a/metadata/md5-cache/dev-python/pywinrm-0.4.3 b/metadata/md5-cache/dev-python/pywinrm-0.4.3
new file mode 100644
index 000000000000..5e51d0c25ba5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pywinrm-0.4.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-ntlm[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/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] kerberos? ( <dev-python/pykerberos-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-credssp[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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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 client for the Windows Remote Management (WinRM) service
+EAPI=8
+HOMEPAGE=https://github.com/diyan/pywinrm/
+IUSE=kerberos test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-ntlm[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/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] kerberos? ( <dev-python/pykerberos-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-credssp[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/pywinrm/pywinrm-0.4.3.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=1c49d203b6d5f20534b4ea895240981c
diff --git a/metadata/md5-cache/dev-python/requests_pkcs12-1.14 b/metadata/md5-cache/dev-python/requests_pkcs12-1.14
new file mode 100644
index 000000000000..8a01db3bebc3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests_pkcs12-1.14
@@ -0,0 +1,15 @@
+BDEPEND=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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Adds PKCS#12 support to the Python requests library in a clean way
+EAPI=7
+HOMEPAGE=https://github.com/m-click/requests_pkcs12
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/r/requests_pkcs12/requests_pkcs12-1.14.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=dba2b37c2ac49ee6d4fbc9799ccaa7f0
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.2.3 b/metadata/md5-cache/dev-python/setproctitle-1.2.3
new file mode 100644
index 000000000000..ab5bb78ba957
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setproctitle-1.2.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=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/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Allow customization of the process title
+EAPI=8
+HOMEPAGE=https://github.com/dvarrazzo/py-setproctitle
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.2.3.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c5669f3d64ccf4339249137565772a14
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.18.1 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.18.1
new file mode 100644
index 000000000000..74b477314390
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.18.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/nptyping-2[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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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/
+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=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.1.tar.gz -> sphinx-autodoc-typehints-1.18.1.gh.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=65ab4bfceeb5f8b1ce03644a21468a97
diff --git a/metadata/md5-cache/dev-python/stripe-2.72.0 b/metadata/md5-cache/dev-python/stripe-2.72.0
new file mode 100644
index 000000000000..a35f915a5e43
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stripe-2.72.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-util/stripe-mock-0.122.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[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/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stripe python bindings
+EAPI=8
+HOMEPAGE=https://github.com/stripe/stripe-python
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.20[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stripe/stripe-2.72.0.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=575409b691bc0be7afdbe8df02bf3508
diff --git a/metadata/md5-cache/dev-python/svg-path-6.0 b/metadata/md5-cache/dev-python/svg-path-6.0
new file mode 100644
index 000000000000..326bedb1d4f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/svg-path-6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.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=SVG path objects and parser
+EAPI=8
+HOMEPAGE=https://github.com/regebro/svg.path
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+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/regebro/svg.path/archive/6.0.tar.gz -> svg-path-6.0.gh.tar.gz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=88c25d1785e428f61b9e8947544cf3b9
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 05561f292673..b78df471b000 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1
index e2c6406e80f1..07a4bf47a6c6 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.15.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtwayland-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.3-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c04ae22311b353288ea493a60447b93e
+_md5_=f9f334a748a6783d0089cf66941a84fd
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 4afbe9aa64ce..d53447835873 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/mini_portile2-2.8.0 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
index 5b165d50f724..e9ee7bdb756f 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Simplistic port-like solution for developers
 EAPI=8
 HOMEPAGE=https://github.com/flavorjones/mini_portile
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	08015e64ff76dc2e2b177418bc2acb08	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b5b331cdcd9818373badf4d17d4749f5
+_md5_=9c40a7f45ae9fcfedd5d2e0b80df997d
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.13.4 b/metadata/md5-cache/dev-ruby/nokogiri-1.13.4
index 0f0b7f455250..1ca76c9b94bb 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.13.4
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.13.4
@@ -5,7 +5,7 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=8
 HOMEPAGE=https://www.nokogiri.org/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.13:= >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.13.4.tar.gz -> nokogiri-1.13.4-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	08015e64ff76dc2e2b177418bc2acb08	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e1d1eae0cfe43329b2b1d2104365105b
+_md5_=02035fc389063d984e51f7010ff53f84
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index b49fca866b5e..181952883705 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1 b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
index a4df5a1d9430..e73a8b168645 100644
--- a/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
+++ b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx )
 DESCRIPTION=LaTeX macros for writing documents following the ABNT norms
 EAPI=7
 HOMEPAGE=https://www.abntex.net.br/
@@ -9,5 +10,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/abntex/abntex-0.9-beta2.tar.gz doc? ( mirror://sourceforge/abntex/abntex-doc-0.9-beta2.tar.gz )
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=96592114d3032df55a4c8f379412068f
diff --git a/metadata/md5-cache/dev-tex/biblatex-3.14 b/metadata/md5-cache/dev-tex/biblatex-3.14
index 6cd73af8af41..aa796a0db0d7 100644
--- a/metadata/md5-cache/dev-tex/biblatex-3.14
+++ b/metadata/md5-cache/dev-tex/biblatex-3.14
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric
 DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/
@@ -10,5 +11,5 @@ PDEPEND=biber? ( ~dev-tex/biber-2.14 )
 RDEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/biblatex/biblatex-3.14.tds.tgz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=ebcd6706b7afc62e2ce4ddafeac2d069
diff --git a/metadata/md5-cache/dev-tex/biblatex-3.16 b/metadata/md5-cache/dev-tex/biblatex-3.16
index 9a98ddd50317..c675b1066045 100644
--- a/metadata/md5-cache/dev-tex/biblatex-3.16
+++ b/metadata/md5-cache/dev-tex/biblatex-3.16
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric
 DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/
@@ -10,5 +11,5 @@ PDEPEND=biber? ( ~dev-tex/biber-2.16 )
 RDEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/biblatex/biblatex-3.16.tds.tgz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=1a09e58df0a2723d440cc1e3584a885a
diff --git a/metadata/md5-cache/dev-tex/biblatex-gost-1.17 b/metadata/md5-cache/dev-tex/biblatex-gost-1.17
index 10a46a241980..79cfd3b2adb0 100644
--- a/metadata/md5-cache/dev-tex/biblatex-gost-1.17
+++ b/metadata/md5-cache/dev-tex/biblatex-gost-1.17
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8 virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8
 DESCRIPTION=Biblatex styles for Russian GOST 7.0.5-2008 bibliography standard
 EAPI=7
 HOMEPAGE=https://github.com/odomanov/biblatex-gost
@@ -8,5 +9,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8 virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/odomanov/biblatex-gost/archive/ver.1.17.tar.gz -> biblatex-gost-1.17.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=c5fb1a9c302f1029181628d1fbdbac49
diff --git a/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1 b/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
index 8c8ef1944d53..e1c54d02f9ac 100644
--- a/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
+++ b/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base || ( >=media-fonts/culmus-0.110[fancy] <media-fonts/culmus-0.110 ) app-text/t1utils virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=virtual/latex-base || ( >=media-fonts/culmus-0.110[fancy] <media-fonts/culmus-0.110 ) app-text/t1utils
 DESCRIPTION=Culmus fonts support for latex
 EAPI=7
 HOMEPAGE=http://ivritex.sourceforge.net/
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/ivritex/culmus-latex-0.7_src.tar.gz -> culmus-latex-0.7.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=c04d8e300f7563d966d3d50bb886ceca
diff --git a/metadata/md5-cache/dev-tex/foiltex-2.1.4b b/metadata/md5-cache/dev-tex/foiltex-2.1.4b
index f4744003bed9..83325609ea5e 100644
--- a/metadata/md5-cache/dev-tex/foiltex-2.1.4b
+++ b/metadata/md5-cache/dev-tex/foiltex-2.1.4b
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create foils and slides
 EAPI=7
 HOMEPAGE=ftp://ftp.dante.de/tex-archive/help/Catalogue/entries/foiltex.html
@@ -9,5 +8,5 @@ LICENSE=FoilTeX
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/foiltex-2.1.4b.zip
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=e854080020895f8f0ed658159e54564f
diff --git a/metadata/md5-cache/dev-tex/frakturx-20070103-r1 b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
index 61e0e6dc180a..35274cdc9472 100644
--- a/metadata/md5-cache/dev-tex/frakturx-20070103-r1
+++ b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Collection of blackletter fonts for LaTeX
 EAPI=7
 HOMEPAGE=http://www.gaehrken.de/fraktur/
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2 free-noncomm
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/frakturx-20070103-base.zip mirror://gentoo/frakturx-20070103-tfrak.zip mirror://gentoo/frakturx-20070103-obibel.zip mirror://gentoo/frakturx-20070103-odedruck.zip mirror://gentoo/frakturx-20070103-odeschmk.zip mirror://gentoo/frakturx-20070103-oweissfr.zip mirror://gentoo/frakturx-20070103-oweissgo.zip mirror://gentoo/frakturx-20070103-talteswab.zip mirror://gentoo/frakturx-20070103-tbrtkpf.zip mirror://gentoo/frakturx-20070103-tkngsbg.zip mirror://gentoo/frakturx-20070103-twieynk.zip mirror://gentoo/frakturx-20070103-twieyvig.zip mirror://gentoo/frakturx-20070103-tzentenar.zip
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=21d187aea48e5b333f821053d8647f20
diff --git a/metadata/md5-cache/dev-tex/glossaries-4.41 b/metadata/md5-cache/dev-tex/glossaries-4.41
index 8e045f103488..c4e5cf148bd9 100644
--- a/metadata/md5-cache/dev-tex/glossaries-4.41
+++ b/metadata/md5-cache/dev-tex/glossaries-4.41
@@ -1,6 +1,5 @@
-BDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric app-arch/unzip
+BDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Create glossaries and lists of acronyms
 EAPI=7
 HOMEPAGE=http://www.ctan.org/pkg/glossaries/
@@ -10,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> glossaries-4.41.zip
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=258c57495cc9023d07eb291db1eb5a50
diff --git a/metadata/md5-cache/dev-tex/glossaries-4.46 b/metadata/md5-cache/dev-tex/glossaries-4.46
index 49d022217244..83967369042b 100644
--- a/metadata/md5-cache/dev-tex/glossaries-4.46
+++ b/metadata/md5-cache/dev-tex/glossaries-4.46
@@ -1,6 +1,5 @@
-BDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric app-arch/unzip
+BDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Create glossaries and lists of acronyms
 EAPI=7
 HOMEPAGE=http://www.ctan.org/pkg/glossaries/
@@ -10,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> glossaries-4.46.zip
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=9ccc0d6bc1758995b0c86a7100199702
diff --git a/metadata/md5-cache/dev-tex/ivritex-1.1.2 b/metadata/md5-cache/dev-tex/ivritex-1.1.2
index 43865782bf77..06261d2cef41 100644
--- a/metadata/md5-cache/dev-tex/ivritex-1.1.2
+++ b/metadata/md5-cache/dev-tex/ivritex-1.1.2
@@ -1,5 +1,5 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Hebrew support for TeX
 EAPI=7
 HOMEPAGE=http://ivritex.sourceforge.net/
@@ -9,5 +9,5 @@ RDEPEND=virtual/latex-base
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/ivritex/ivritex-1.1.2.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=37aedefa8e1eee9dfe33c5180cb2a027
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.59 b/metadata/md5-cache/dev-tex/latex-beamer-3.59
index a9af3f4386a0..648021dd3c89 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.59
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.59
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=dev-texlive/texlive-latex
 DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
@@ -9,5 +10,5 @@ LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.59.tar.gz -> latex-beamer-3.59.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=5ea2d5a194d40ec34dcc54bc0735bb55
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.60 b/metadata/md5-cache/dev-tex/latex-beamer-3.60
index 16b78d158335..e2297b13eef8 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.60
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.60
@@ -1,6 +1,5 @@
-BDEPEND=dev-texlive/texlive-latex
+BDEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
@@ -10,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.60.tar.gz -> latex-beamer-3.60.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=d911bba28978418455f7032e1d19bfc4
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.61 b/metadata/md5-cache/dev-tex/latex-beamer-3.61
index 595c8e81027f..bf5856c8aaa9 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.61
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.61
@@ -1,6 +1,5 @@
-BDEPEND=dev-texlive/texlive-latex
+BDEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
@@ -10,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.61.tar.gz -> latex-beamer-3.61.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=d911bba28978418455f7032e1d19bfc4
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.62 b/metadata/md5-cache/dev-tex/latex-beamer-3.62
index f29733d018ba..60c70291f9a4 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.62
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.62
@@ -1,6 +1,5 @@
-BDEPEND=dev-texlive/texlive-latex
+BDEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
@@ -10,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.62.tar.gz -> latex-beamer-3.62.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=a3a6688fae92b417d539958b3809158d
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.63 b/metadata/md5-cache/dev-tex/latex-beamer-3.63
index a9c2145ce169..50598f4be8f7 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.63
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.63
@@ -1,6 +1,5 @@
-BDEPEND=dev-texlive/texlive-latex
+BDEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
@@ -10,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.63.tar.gz -> latex-beamer-3.63.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=e62f9df7743af7f8422c29bbc2bedb6c
diff --git a/metadata/md5-cache/dev-tex/latex-calendar-3.1 b/metadata/md5-cache/dev-tex/latex-calendar-3.1
index 40b692666cfa..ef7862d9f239 100644
--- a/metadata/md5-cache/dev-tex/latex-calendar-3.1
+++ b/metadata/md5-cache/dev-tex/latex-calendar-3.1
@@ -1,5 +1,5 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create Calendars. Very flexible and robust
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/calendar/
@@ -8,5 +8,5 @@ LICENSE=LaTeX-Calendar
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/latex-calendar-3.1.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=bc10069fd587263199e4d8ea7c0276a3
diff --git a/metadata/md5-cache/dev-tex/lgrind-3.67-r3 b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
index b9c9819c8eb5..81f6380ce3e4 100644
--- a/metadata/md5-cache/dev-tex/lgrind-3.67-r3
+++ b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
@@ -1,5 +1,5 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A pretty printer for various programming languages with tex output
 EAPI=7
 HOMEPAGE=http://www.tug.org/
@@ -9,5 +9,5 @@ LICENSE=BSD LGrind-Jacobson
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/lgrind-3.67.tgz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fbe82652576950b8254c94a80fe25f18
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1 b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
index 91d995d0db29..6f290548c99b 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
@@ -1,6 +1,6 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=virtual/latex-base dev-java/pdfbox:1.8 dev-java/fontbox:1.7 >=virtual/jdk-1.6 virtual/latex-base >=sys-apps/texinfo-4.2-r5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=virtual/latex-base dev-java/pdfbox:1.8 dev-java/fontbox:1.7 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=Extract annotations from pdf files
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/pax/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-1.6 virtual/latex-base >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/pdfannotextractor-0.1l.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	latex-package	223c086dd062dba43b89726880f9f0c2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	latex-package	c20e442c3953c765f636630631c96194	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=152f7c636e29cdec3c34bc7717f26d94
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2 b/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2
index ee0ef3264b7a..954b7ca3486e 100644
--- a/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2
@@ -1,5 +1,5 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The TeX Portable Graphic Format
 EAPI=7
 HOMEPAGE=https://github.com/pgf-tikz/pgf
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LPPL-1.3c FDL-1.2
 RDEPEND=dev-texlive/texlive-latexrecommended virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4b.tar.gz -> pgf-3.1.4b.tar.gz https://dev.gentoo.org/~zlogene/distfiles/dev-tex/pgf/pgf-3.1.4b-revisioned.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4b/pgfmanual.pdf -> pgf-3.1.4b-pgfmanual.pdf )
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=4be82acd5bba48acce9bef94bef2d704
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.5b b/metadata/md5-cache/dev-tex/pgf-3.1.5b
index 492b8224d82a..ef53e29d3c76 100644
--- a/metadata/md5-cache/dev-tex/pgf-3.1.5b
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.5b
@@ -1,5 +1,5 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The TeX Portable Graphic Format
 EAPI=7
 HOMEPAGE=https://github.com/pgf-tikz/pgf
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LPPL-1.3c FDL-1.2
 RDEPEND=dev-texlive/texlive-latexrecommended virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.5b.tar.gz -> pgf-3.1.5b.tar.gz https://dev.gentoo.org/~zlogene/distfiles/dev-tex/pgf/pgf-3.1.5b-revisioned.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.5b/pgfmanual.pdf -> pgf-3.1.5b-pgfmanual.pdf )
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=f0cf40a8733f68133f58ef6910d861d4
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.9a b/metadata/md5-cache/dev-tex/pgf-3.1.9a
index 177d11f8a902..b55ee296a126 100644
--- a/metadata/md5-cache/dev-tex/pgf-3.1.9a
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.9a
@@ -1,5 +1,5 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The TeX Portable Graphic Format
 EAPI=7
 HOMEPAGE=https://github.com/pgf-tikz/pgf
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LPPL-1.3c FDL-1.2
 RDEPEND=dev-texlive/texlive-latexrecommended virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.9a.tar.gz -> pgf-3.1.9a.tar.gz https://dev.gentoo.org/~tamiko/distfiles/pgf-3.1.9a-revisioned.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.9a/pgfmanual-3.1.9a.pdf -> pgf-3.1.9a-pgfmanual.pdf )
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=f14514f1a3edc2ab781bcdeeab7043b7
diff --git a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9 b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
index 514fc791cd8e..a32aa09b1f50 100644
--- a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
+++ b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
@@ -1,5 +1,5 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Type1 cyrillic fonts collection
 EAPI=7
 HOMEPAGE=ftp://scon155.phys.msu.su/pub/russian/psfonts/
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=ftp://scon155.phys.msu.su/pub/russian/psfonts/0.4d-beta/PSCyr-0.4-beta9-tex.tar.gz ftp://scon155.phys.msu.su/pub/russian/psfonts/0.4d-beta/PSCyr-0.4-beta9-type1.tar.gz
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=d59e37d3b4a8c077d79d8c868539292e
diff --git a/metadata/md5-cache/dev-tex/pythontex-0.17 b/metadata/md5-cache/dev-tex/pythontex-0.17
index 31c8f43ec67c..d87be236dea0 100644
--- a/metadata/md5-cache/dev-tex/pythontex-0.17
+++ b/metadata/md5-cache/dev-tex/pythontex-0.17
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=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 ) >=dev-texlive/texlive-latexextra-2016 dev-tex/pgf virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=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 ) >=dev-texlive/texlive-latexextra-2016 dev-tex/pgf
 DESCRIPTION=Fast Access to Python from within LaTeX
 EAPI=7
 HOMEPAGE=https://github.com/gpoore/pythontex
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/gpoore/pythontex/archive/v0.17.tar.gz -> pythontex-0.17.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	223c086dd062dba43b89726880f9f0c2	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=dd35d12d0b451693ceaa5c1053744664
diff --git a/metadata/md5-cache/dev-tex/pythontex-0.18 b/metadata/md5-cache/dev-tex/pythontex-0.18
index d43cd0a6c971..66f7d1a87fbd 100644
--- a/metadata/md5-cache/dev-tex/pythontex-0.18
+++ b/metadata/md5-cache/dev-tex/pythontex-0.18
@@ -1,5 +1,6 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=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-texlive/texlive-latexextra-2016 dev-tex/pgf virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=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-texlive/texlive-latexextra-2016 dev-tex/pgf
 DESCRIPTION=Fast Access to Python from within LaTeX
 EAPI=7
 HOMEPAGE=https://github.com/gpoore/pythontex
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/gpoore/pythontex/archive/v0.18.tar.gz -> pythontex-0.18.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	223c086dd062dba43b89726880f9f0c2	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0d44abf5f93a5abb8dec241fc9a0e9c3
diff --git a/metadata/md5-cache/dev-tex/rail-1.2_p1-r1 b/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
index 1f6b39c6cda7..cfd44b577c84 100644
--- a/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
+++ b/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip sys-devel/bison sys-devel/flex
+BDEPEND=app-arch/unzip sys-devel/bison sys-devel/flex virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Offers syntax/railroad diagrams
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/support/rail/
@@ -9,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=http://mirror.ctan.org/support/rail.zip -> rail-1.2_p1.zip
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b6f42f84c82eb5040565f66ee5744af7
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
index f279cc67d5f0..cac138e868c4 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-libs/kpathsea java? ( >=virtual/jdk-1.8:* ) virtual/latex-base >=sys-apps/texinfo-4.2-r5 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=dev-libs/kpathsea java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=7
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
@@ -10,5 +10,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.8:* ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.tar.xz doc? ( https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.doc.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	latex-package	223c086dd062dba43b89726880f9f0c2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	latex-package	c20e442c3953c765f636630631c96194	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=851e615ffdd287f63ccf2f23e1636640
diff --git a/metadata/md5-cache/dev-tex/vc-0.6 b/metadata/md5-cache/dev-tex/vc-0.6
index 1d5a5f110c80..d25ce6aa3980 100644
--- a/metadata/md5-cache/dev-tex/vc-0.6
+++ b/metadata/md5-cache/dev-tex/vc-0.6
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The vc (version control) bundle
 EAPI=7
 HOMEPAGE=https://www.ctan.org/pkg/vc
@@ -9,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/vc-0.6.zip
-_eclasses_=latex-package	223c086dd062dba43b89726880f9f0c2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	latex-package	c20e442c3953c765f636630631c96194
 _md5_=588a8565e15aa7ee609a4430f5494e63
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 79dc8d03e2b5..276c5a194f09 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/boost-build-1.79.0 b/metadata/md5-cache/dev-util/boost-build-1.79.0
new file mode 100644
index 000000000000..74995d176a04
--- /dev/null
+++ b/metadata/md5-cache/dev-util/boost-build-1.79.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A system for large project software construction, simple to use and powerful
+EAPI=8
+HOMEPAGE=https://www.boost.org/build/
+IUSE=examples
+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=Boost-1.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c114cff463ad83fcf888a4c311fb36fb
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
new file mode 100644
index 000000000000..f11f1cb4d857
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] )
+DESCRIPTION=GDBus code and documentation generator
+EAPI=7
+HOMEPAGE=https://www.gtk.org/
+IUSE=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 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.1.tar.xz
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=6d681f696b70191a102495549b412a3e
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.72.1 b/metadata/md5-cache/dev-util/glib-utils-2.72.1
new file mode 100644
index 000000000000..5ec3158778e1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glib-utils-2.72.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils
+DEFINED_PHASES=compile configure install setup
+DEPEND=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 )
+DESCRIPTION=Build utilities for GLib using projects
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+IUSE=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 ~x86-winnt
+LICENSE=LGPL-2.1+
+RDEPEND=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 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=910c89ed3ac101f57a506787d5156421
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.10.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.10.0
index b41953e72d76..eaa2524bcd6b 100644
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.10.0
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.10.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.50.0 >=dev-qt/qtcore-5.15:5
 DESCRIPTION=LXQt Build Tools
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/glib-2.50.0 >=dev-qt/qtcore-5.15:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-build-tools/releases/download/0.10.0/lxqt-build-tools-0.10.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d9d5049107aeb208d1283e2b3986950e
+_md5_=e86f4f3af905b8b064d1a2da156eb044
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-8.0.0-r1 b/metadata/md5-cache/dev-util/mingw64-runtime-8.0.0-r1
index 9056679d25b5..a52d2d3431d9 100644
--- a/metadata/md5-cache/dev-util/mingw64-runtime-8.0.0-r1
+++ b/metadata/md5-cache/dev-util/mingw64-runtime-8.0.0-r1
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v8.0.0.tar.bz2
 _eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3b8a7fd58ed8b8b76996ebf6567fbe35
+_md5_=8f3b072ba236289d7136454aa319c43b
diff --git a/metadata/md5-cache/dev-util/pahole-1.23 b/metadata/md5-cache/dev-util/pahole-1.23
index b46a44734287..1244c3794462 100644
--- a/metadata/md5-cache/dev-util/pahole-1.23
+++ b/metadata/md5-cache/dev-util/pahole-1.23
@@ -5,11 +5,11 @@ DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=7
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
 IUSE=debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=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 ) >=dev-libs/elfutils-0.178 sys-libs/zlib
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.23.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1821895e57cb56faaf7e76060be4d8df
+_md5_=06517bf4a07579f8f08d67456da23d22
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 2b48d3055980..729fdfe50661 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/freeciv-3.0.0 b/metadata/md5-cache/games-strategy/freeciv-3.0.0
deleted file mode 100644
index 36e6bb36e1dd..000000000000
--- a/metadata/md5-cache/games-strategy/freeciv-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig !dedicated? ( nls? ( sys-devel/gettext ) )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) !dedicated? ( x11-base/xorg-proto )
-DESCRIPTION=Multiplayer strategy game (Civilization Clone)
-EAPI=8
-HOMEPAGE=http://www.freeciv.org/
-IUSE=aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-REQUIRED_USE=system-lua? ( ^^ ( lua_single_target_lua5-3 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/freeciv/freeciv-3.0.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9cb3b63563cca25c5ff60b2c39a62ae2
diff --git a/metadata/md5-cache/games-strategy/freeciv-3.0.1-r1 b/metadata/md5-cache/games-strategy/freeciv-3.0.1-r1
new file mode 100644
index 000000000000..00de65ba6aaa
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/freeciv-3.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/gzip virtual/pkgconfig !dedicated? ( nls? ( sys-devel/gettext ) )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl dev-libs/icu:= sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl ) ) !dedicated? ( media-libs/libpng gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) !dedicated? ( x11-base/xorg-proto )
+DESCRIPTION=Multiplayer strategy game (Civilization Clone)
+EAPI=8
+HOMEPAGE=http://www.freeciv.org/
+IUSE=aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua +lua_single_target_lua5-3
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl dev-libs/icu:= sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl ) ) !dedicated? ( media-libs/libpng gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
+REQUIRED_USE=system-lua? ( ^^ ( lua_single_target_lua5-3 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeciv/freeciv-3.0.1.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=138e213cdfd99dcd01b6c4bd0ce5f717
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index d6569ab1c2c0..d521292669d0 100644
Binary files a/metadata/md5-cache/lxqt-base/Manifest.gz and b/metadata/md5-cache/lxqt-base/Manifest.gz differ
diff --git a/metadata/md5-cache/lxqt-base/liblxqt-1.0.0 b/metadata/md5-cache/lxqt-base/liblxqt-1.0.0
index a8918e7bbb31..7afc2755fcef 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-1.0.0
+++ b/metadata/md5-cache/lxqt-base/liblxqt-1.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Common base library for the LXQt desktop environment
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
 IUSE=+backlight
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=dev-libs/libqtxdg-3.8.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=dev-qt/qtxml-5.15:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libXScrnSaver backlight? ( sys-auth/polkit-qt )
 SLOT=0/1.0
 SRC_URI=https://github.com/lxqt/liblxqt/releases/download/1.0.0/liblxqt-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e9547f1a6acdc118ec6c581a641d306a
+_md5_=893baadcd2c956b027cd7b0288898d13
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.4.6 b/metadata/md5-cache/lxqt-base/libsysstat-0.4.6
index 0a00f4c81c8b..9414e2f2502c 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.6
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.4.6
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5
 DESCRIPTION=Qt GUI for System Statistics
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtcore-5.15:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/libsysstat/releases/download/0.4.6/libsysstat-0.4.6.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=049cb3ff6505a72cbee864e8c0da4618
+_md5_=6a1f6e3a7faaa64bf5012016e130c556
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-about-1.0.0
index 5bafe7f9e9b1..3bbb74761714 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt about dialog
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-1.0*:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-about/releases/download/1.0.0/lxqt-about-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7b4390087104a11b382ac410af68e0e1
+_md5_=98294d26fe662b4b0442a3d9e507bbe8
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-1.0.0
index bb942d8d29ee..635c3cfd3ad4 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev
 DESCRIPTION=LXQt system administration tool
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 =lxqt-base/liblxqt-1.0* kde-frameworks/kwindowsystem:5 >=sys-auth/polkit-qt-0.113.0 =lxqt-base/liblxqt-1.0*:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-admin/releases/download/1.0.0/lxqt-admin-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bf90a68ed675ec3c05612aa349462e0d
+_md5_=3ffb5b7de8f5e10bcd085fce63387515
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-config-1.0.0
index 70800c9d4d78..a6e4b44dc8b7 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-1.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=LXQt system configuration control center
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
 IUSE=+monitor +touchpad
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=dev-qt/qtxml-5.15:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-1.0*:= sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev:= x11-drivers/xf86-input-libinput x11-libs/libXi )
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/1.0.0/lxqt-config-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1cb991b39e805f77a3115d15f4245095
+_md5_=1279c6e902e57bbf4748aa47f4331682
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-1.0.1 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-1.0.1
index 88716e197594..75dd376ba0b1 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-1.0.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-1.0.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev
 DESCRIPTION=Daemon and library for global keyboard shortcuts registration
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-1.0*:= x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-globalkeys/releases/download/1.0.1/lxqt-globalkeys-1.0.1.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=90232c75a1abfb06e624512903562043
+_md5_=621ceea01db53a5124017f8f9ee3d901
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-meta-1.0.0
index de4c2d4461b9..2bccd66b5aeb 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-1.0.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
 IUSE=+about admin archiver +display-manager +filemanager lximage minimal nls +policykit powermanagement processviewer screenshot +sddm ssh-askpass sudo terminal +trash
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=metapackage
 RDEPEND=kde-frameworks/oxygen-icons >=lxde-base/lxmenu-data-0.1.5 =lxqt-base/lxqt-config-1.0* =lxqt-base/lxqt-globalkeys-1.0* =lxqt-base/lxqt-notificationd-1.0* =lxqt-base/lxqt-panel-1.0* =lxqt-base/lxqt-qtplugin-1.0* =lxqt-base/lxqt-runner-1.0* =lxqt-base/lxqt-session-1.0* virtual/ttf-fonts x11-terms/xterm =x11-themes/lxqt-themes-1.0* about? ( =lxqt-base/lxqt-about-1.0* ) admin? ( =lxqt-base/lxqt-admin-1.0* ) archiver? ( app-arch/lxqt-archiver ) display-manager? ( sddm? ( >=x11-misc/sddm-0.11.0 ) !sddm? ( x11-misc/lightdm ) ) filemanager? ( =x11-misc/pcmanfm-qt-1.0* ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) nls? ( dev-qt/qttranslations:5 ) policykit? ( =lxqt-base/lxqt-policykit-1.0* ) powermanagement? ( =lxqt-base/lxqt-powermanagement-1.0* ) processviewer? ( x11-misc/qps:0 ) screenshot? ( x11-misc/screengrab:0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-1.0* ) sudo? ( =lxqt-base/lxqt-sudo-1.0* ) terminal? ( x11-terms/qterminal:0 ) trash? ( gnome-base/gvfs )
 REQUIRED_USE=trash? ( filemanager )
 SLOT=0
-_md5_=8c8c873b7dde93f2ce5de96177a876bc
+_md5_=886412f50c41b2fd078f0b7aa315c694
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-1.0.0
index 22ba5baace1b..6ac856cdb652 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >
 DESCRIPTION=LXQt notification daemon and library
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-1.0*:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-notificationd/releases/download/1.0.0/lxqt-notificationd-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bb60e8a6a9fa998c23f16999da3cb45a
+_md5_=63b748a6c174a1245e4226cba5bf9669
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-1.0.0
index 11135e5793ed..ed346732ef6e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtwidgets-5.15:5 =lxqt-base/liblxqt-1.0*:
 DESCRIPTION=LXQt OpenSSH user password prompt tool
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtwidgets-5.15:5 =lxqt-base/liblxqt-1.0*:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-openssh-askpass/releases/download/1.0.0/lxqt-openssh-askpass-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f65674a7319bc6709701880ce7cebd77
+_md5_=a4750b708900a089400d381d6f2f9e62
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-panel-1.0.0
index 14d82f83dc9b..e1ddcdd921c4 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-1.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=LXQt desktop panel and plugins
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
 IUSE=+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop +spacer +statusnotifier sysstat +taskbar tray +volume +worldclock
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=dev-qt/qtxml-5.15:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-1.0*:= =lxqt-base/lxqt-globalkeys-1.0* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) lm-sensors? ( sys-apps/lm-sensors:= ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] >=dev-qt/qtconcurrent-5.15:5 ) sysstat? ( >=lxqt-base/libsysstat-0.4.6 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) )
 REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-panel/releases/download/1.0.0/lxqt-panel-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d7ca56374b1e27051c7d6832c7014d1a
+_md5_=1f1137e73d6635ed13578fd71badc865
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-policykit-1.0.0
index b677c6aabe13..40cf4d0712cd 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 =l
 DESCRIPTION=LXQt PolKit authentication agent
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 =lxqt-base/liblxqt-1.0*:= >=sys-auth/polkit-qt-0.113.0
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-policykit/releases/download/1.0.0/lxqt-policykit-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=875803f142b58857277f2d8f21a4b276
+_md5_=b9c9d94f51d0c4fc140ed1d582b25a91
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-1.0.0
index 410ba3356427..23fe5a1853d1 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >
 DESCRIPTION=LXQt daemon for power management and auto-suspend
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-1.0*:= =lxqt-base/lxqt-globalkeys-1.0* sys-power/upower
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-powermanagement/releases/download/1.0.0/lxqt-powermanagement-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fa90beb5f8c98712fec36b71656ee1ff
+_md5_=f862491dc110bb502d06130a7dc98cb9
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-1.0.0
index 2ed4c5531a2b..fa2d14b8351e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-1.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libdbusmenu-qt[qt5(+)] >=dev-libs/libqtxdg-3.7.0 >=dev-qt/qtcore
 DESCRIPTION=LXQt system integration plugin for Qt
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libdbusmenu-qt[qt5(+)] >=dev-libs/libqtxdg-3.7.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5= >=dev-qt/qtwidgets-5.15:5 =x11-libs/libfm-qt-1.0*
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-qtplugin/releases/download/1.0.0/lxqt-qtplugin-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9d35247ab566761b72b229cbb27be1f6
+_md5_=385bdb68c7f2116e121ad490c2b8437f
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-runner-1.0.0
index bfcf8e081c1d..47b4b8ff990e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-cpp/muParser-2.2.3 >=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5
 DESCRIPTION=LXQt quick launcher
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-cpp/muParser-2.2.3 >=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtxml-5.15:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-1.0*:= =lxqt-base/lxqt-globalkeys-1.0*
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-runner/releases/download/1.0.0/lxqt-runner-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f2382189aa214e73bb27065ca6ec7168
+_md5_=7184aea4171428852e87a616e2d76c23
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-1.0.1 b/metadata/md5-cache/lxqt-base/lxqt-session-1.0.1
index 1215b05c69ec..ee02854da424 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-1.0.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-1.0.1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQt Session Manager
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
 IUSE=+udev
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-1.0*:= sys-process/procps:= x11-libs/libX11 x11-misc/xdg-user-dirs udev? ( virtual/libudev:= )
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-session/releases/download/1.0.1/lxqt-session-1.0.1.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ab7b350483b15c17e83a362b1e7ccce6
+_md5_=ac8fa16452ca98196972fda24abd9120
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-1.0.0 b/metadata/md5-cache/lxqt-base/lxqt-sudo-1.0.0
index a990e5143f7b..f2df64d843c2 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-1.0.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-1.0.0
@@ -4,10 +4,10 @@ DEPEND=app-admin/sudo >=dev-qt/qtgui-5.15:5 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtwi
 DESCRIPTION=LXQt GUI frontend for sudo
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=app-admin/sudo >=dev-qt/qtgui-5.15:5 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtwidgets-5.15:5 ~lxqt-base/liblxqt-1.0.0:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-sudo/releases/download/1.0.0/lxqt-sudo-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=62efd6ade527a407ed41f135366b03b3
+_md5_=0ce8cfd1c00315e4acaaaea0344e1288
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index ed37fabc5d67..5ceabb02e7d7 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/mutt-2.2.1 b/metadata/md5-cache/mail-client/mutt-2.2.3
similarity index 93%
rename from metadata/md5-cache/mail-client/mutt-2.2.1
rename to metadata/md5-cache/mail-client/mutt-2.2.3
index fb3cd1952041..742f2003bc6e 100644
--- a/metadata/md5-cache/mail-client/mutt-2.2.1
+++ b/metadata/md5-cache/mail-client/mutt-2.2.3
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) ) nls? ( virtual/libintl ) sasl? ( gsasl? ( virtual/gsasl ) !gsasl? ( >=dev-libs/cyrus-sasl-2 ) ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( >=dev-libs/openssl-0.9.6:0 ) pgp-classic? ( app-crypt/gnupg )
 REQUIRED_USE=gsasl? ( sasl ) hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
 SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-2.2.1.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-2.2.1.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-2.2.1-patches-r0.tar.xz
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-2.2.3.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-2.2.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-2.2.3-patches-r0.tar.xz
 _eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7904a6ea26cf00fac2f130b9269c6063
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 02f6f3d2b3a4..8794def8d13e 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.70-r1 b/metadata/md5-cache/media-gfx/asymptote-2.70-r1
index 5e0470b6c9ab..99997687de75 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.70-r1
+++ b/metadata/md5-cache/media-gfx/asymptote-2.70-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) X? ( 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 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) X? ( 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 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
 HOMEPAGE=https://asymptote.sourceforge.io/
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) offscreen?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.70.src.tgz
-_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	223c086dd062dba43b89726880f9f0c2	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=53672f28fa2679607fbed68a6f25e2a9
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.77 b/metadata/md5-cache/media-gfx/asymptote-2.77
index fa61f0bbaa60..b7bfcb126106 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.77
+++ b/metadata/md5-cache/media-gfx/asymptote-2.77
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( 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/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( 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/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
 HOMEPAGE=https://asymptote.sourceforge.io/
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.77.src.tgz
-_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	223c086dd062dba43b89726880f9f0c2	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c1ba88d824da171f73a2e1ad6a9f8121
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.78 b/metadata/md5-cache/media-gfx/asymptote-2.78
index ebcd7afcff39..0f0a10f16843 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.78
+++ b/metadata/md5-cache/media-gfx/asymptote-2.78
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( 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/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( 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/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
 HOMEPAGE=https://asymptote.sourceforge.io/
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.78.src.tgz
-_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	223c086dd062dba43b89726880f9f0c2	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c1ba88d824da171f73a2e1ad6a9f8121
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.80 b/metadata/md5-cache/media-gfx/asymptote-2.80
index 769869b22df4..95f1f5583cfc 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.80
+++ b/metadata/md5-cache/media-gfx/asymptote-2.80
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( 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/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) 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 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( 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/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
 HOMEPAGE=https://asymptote.sourceforge.io/
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.80.src.tgz
-_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	223c086dd062dba43b89726880f9f0c2	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ed0bc88bf76f6a4339ba881778d62982
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-1.0.0 b/metadata/md5-cache/media-gfx/lximage-qt-1.0.0
index 368c81881e8e..a0ec5d9013c6 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-1.0.0
+++ b/metadata/md5-cache/media-gfx/lximage-qt-1.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qt
 DESCRIPTION=Qt Image Viewer
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtprintsupport-5.15:5 >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 media-libs/libexif =x11-libs/libfm-qt-1.0*:= x11-libs/libX11 x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://github.com/lxqt/lximage-qt/releases/download/1.0.0/lximage-qt-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2f1752cf9146a17d140af58c0d9b7349
+_md5_=cb73845968e922753bb431e773682396
diff --git a/metadata/md5-cache/media-gfx/openscad-9999 b/metadata/md5-cache/media-gfx/openscad-9999
index 22a39773ef9d..ca8ef703535f 100644
--- a/metadata/md5-cache/media-gfx/openscad-9999
+++ b/metadata/md5-cache/media-gfx/openscad-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/itstool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/libzip:= media-gfx/opencsg media-libs/fontconfig media-libs/freetype media-libs/glew:0= media-libs/harfbuzz:= media-libs/lib3mf sci-mathematics/cgal:= virtual/opengl cairo? ( x11-libs/cairo ) emacs? ( app-editors/emacs:* ) !headless? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= dbus? ( dev-qt/qtdbus:5 ) gamepad? ( dev-qt/qtgamepad:5 ) ) spacenav? ( dev-libs/libspnav )
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/libzip:= media-gfx/opencsg media-libs/fontconfig media-libs/freetype media-libs/glew:0= media-libs/harfbuzz:= media-libs/lib3mf sci-mathematics/cgal:= virtual/opengl cairo? ( x11-libs/cairo ) emacs? ( app-editors/emacs:* ) !headless? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= dbus? ( dev-qt/qtdbus:5 ) gamepad? ( dev-qt/qtgamepad:5 ) ) spacenav? ( dev-libs/libspnav )
 DESCRIPTION=The Programmers Solid 3D CAD Modeller
 EAPI=8
 HOMEPAGE=https://www.openscad.org/
 IUSE=cairo dbus emacs gamepad headless spacenav
 LICENSE=GPL-3+ LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/libzip:= media-gfx/opencsg media-libs/fontconfig media-libs/freetype media-libs/glew:0= media-libs/harfbuzz:= media-libs/lib3mf sci-mathematics/cgal:= virtual/opengl cairo? ( x11-libs/cairo ) emacs? ( app-editors/emacs:* ) !headless? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= dbus? ( dev-qt/qtdbus:5 ) gamepad? ( dev-qt/qtgamepad:5 ) ) spacenav? ( dev-libs/libspnav )
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/libzip:= media-gfx/opencsg media-libs/fontconfig media-libs/freetype media-libs/glew:0= media-libs/harfbuzz:= media-libs/lib3mf sci-mathematics/cgal:= virtual/opengl cairo? ( x11-libs/cairo ) emacs? ( app-editors/emacs:* ) !headless? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= dbus? ( dev-qt/qtdbus:5 ) gamepad? ( dev-qt/qtgamepad:5 ) ) spacenav? ( dev-libs/libspnav )
 REQUIRED_USE=headless? ( !dbus !gamepad !spacenav )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	elisp-common	f9c72486dbcb18b633c9d0949211d86e	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a2800bcc532c065a789ff16bdb7da0a4
+_md5_=9d69bf5505b9df2bfcd7d366aa7f72e8
diff --git a/metadata/md5-cache/media-gfx/plantuml-1.2022.1 b/metadata/md5-cache/media-gfx/plantuml-1.2022.1
deleted file mode 100644
index 6dba5687e7d9..000000000000
--- a/metadata/md5-cache/media-gfx/plantuml-1.2022.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Draw UML diagrams using a simple and human readable text description
-EAPI=8
-HOMEPAGE=https://plantuml.com
-IUSE=source
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 media-gfx/graphviz >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/plantuml/plantuml-1.2022.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=889b865375f9d3d98eb399403630c9d5
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 0ea615735b3e..1fc907799cb4 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/ilmbase-2.5.8 b/metadata/md5-cache/media-libs/ilmbase-2.5.8
new file mode 100644
index 000000000000..29d75fe30d16
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ilmbase-2.5.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!media-libs/openexr:3
+DESCRIPTION=OpenEXR ILM Base libraries
+EAPI=8
+HOMEPAGE=https://www.openexr.com/
+IUSE=large-stack static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=!media-libs/openexr:3
+RESTRICT=!test? ( test )
+SLOT=0/25
+SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.8.tar.gz -> ilmbase-2.5.8.tar.gz
+_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=33fd23021c02603d4818482ff88dfe68
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129
deleted file mode 100644
index ed7c9a33355b..000000000000
--- a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/openssl:= media-libs/opus alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
-DESCRIPTION=VoIP library for Telegram clients
-EAPI=8
-HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
-IUSE=+dsp +alsa pulseaudio
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=Unlicense
-RDEPEND=dev-libs/openssl:= media-libs/opus alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=|| ( alsa pulseaudio )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/2cffda6222f07cd7d0aa4627a06fa99b05a3956d.tar.gz -> libtgvoip-2.4.4_p20211129.tar.gz
-_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5085e8bf533d60728cc5d1a52b1c0027
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.8 b/metadata/md5-cache/media-libs/openexr-2.5.8
new file mode 100644
index 000000000000..505858803e42
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openexr-2.5.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~media-libs/ilmbase-2.5.8:=[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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
+EAPI=8
+HOMEPAGE=https://www.openexr.com/
+IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=~media-libs/ilmbase-2.5.8:=[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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
+SLOT=0/25
+SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.8.tar.gz -> openexr-2.5.8.tar.gz
+_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=dc43a427329d99cae408ad1a9d727052
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20211207 b/metadata/md5-cache/media-libs/tg_owt-0_pre20211207
deleted file mode 100644
index dab0dd8c3a52..000000000000
--- a/metadata/md5-cache/media-libs/tg_owt-0_pre20211207
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/abseil-cpp:=[cxx17(+)] dev-libs/libevent:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= net-libs/usrsctp screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
-DESCRIPTION=WebRTC build for Telegram
-EAPI=8
-HOMEPAGE=https://github.com/desktop-app/tg_owt
-IUSE=screencast +X
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-cpp/abseil-cpp:=[cxx17(+)] dev-libs/libevent:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= net-libs/usrsctp screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
-SLOT=0/20211207
-SRC_URI=https://github.com/desktop-app/tg_owt/archive/d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.tar.gz -> tg_owt-0_pre20211207.tar.gz https://archive.org/download/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1dc9710c608cdc6fd11d6fae522e32a6
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 0d44a60fee4f..22f798f209db 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/unixcw-3.5.1-r1 b/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
index 45b748dc7bca..452c56a8db7e 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
+++ b/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.5.1.tar.gz
 _eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7176c70ff154fe2bd088267a87ba3ec8
+_md5_=5f93c2aa22e857442c7d6989b4af5fd3
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index aadadf0ec93e..010559933591 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/abcmidi-2022.02.21 b/metadata/md5-cache/media-sound/abcmidi-2022.02.21
deleted file mode 100644
index d384a2ca0595..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2022.02.21
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=8
-HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2022.02.21.zip
-_eclasses_=autotools	a7813cfab8862ac10bcf3e01efb3f5c4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=383f6d93d617c76dbecf74b406c2cc2d
diff --git a/metadata/md5-cache/media-sound/pavucontrol-qt-1.0.0 b/metadata/md5-cache/media-sound/pavucontrol-qt-1.0.0
index cc59987f316f..08c093ce2a8f 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-1.0.0
+++ b/metadata/md5-cache/media-sound/pavucontrol-qt-1.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtw
 DESCRIPTION=Qt GUI Pulseaudio Mixer
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtwidgets-5.15:5 media-sound/pulseaudio[glib]
 SLOT=0
 SRC_URI=https://github.com/lxqt/pavucontrol-qt/releases/download/1.0.0/pavucontrol-qt-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7fa7fcb80ceca90ce58c54930016d46e
+_md5_=a7ba3c5d3b65e076708a917491c4335c
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r2 b/metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r2
index 94b7aaeb67bc..e232996e45b7 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r2
+++ b/metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r2
@@ -5,7 +5,7 @@ DESCRIPTION=X(cross)platform Music Multiplexing System, next generation of the X
 EAPI=8
 HOMEPAGE=https://github.com/XMMS2
 IUSE=cxx mlib-update perl python server test aac airplay alsa ao cdda curl ffmpeg flac fluidsynth gme ices jack mac +mad mms modplug mp3 musepack ofa opus oss pulseaudio samba sid sndfile speex tremor vocoder +vorbis wavpack xml zeroconf +server valgrind python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 ~arm ~ppc ~riscv x86
+KEYWORDS=~alpha amd64 ~arm ppc ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-libs/readline:= server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/libogg media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) python? ( virtual/libcrypt:= ) perl? ( dev-lang/perl dev-perl/glib-perl virtual/perl-Carp virtual/perl-IO virtual/perl-Scalar-List-Utils ) 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/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !server? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmms2/xmms2-devel/archive/46da10f0e20c53fd2b40843617ed182c0cba4ebb.tar.gz -> xmms2-0.8_p20201016.tar.gz https://github.com/xmms2/s4/archive/652ac581df7a0bca04334da397f8bb4f86eb7b59.tar.gz -> xmms2-s4-0.8_p20201016.tar.gz https://waf.io/waf-2.0.22.tar.bz2
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=52cc0bcebcad902db930ff1c0627ab71
+_md5_=e34504d9b7195452661007eff0bd0427
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index b32ce4404148..e942f0194943 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/pipewire-0.3.50 b/metadata/md5-cache/media-video/pipewire-0.3.50-r1
similarity index 99%
rename from metadata/md5-cache/media-video/pipewire-0.3.50
rename to metadata/md5-cache/media-video/pipewire-0.3.50-r1
index eacb056be4a2..e94eef66fc68 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.50
+++ b/metadata/md5-cache/media-video/pipewire-0.3.50-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.50/pipewire-0.3.50.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=d69cc4086aa4c1e51e7ed38bc2f863e9
+_md5_=457495f7469a831ce62bdf9821b40594
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 7254a691e4b3..8b127771901f 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/signal-desktop-bin-5.38.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.39.0
similarity index 96%
rename from metadata/md5-cache/net-im/signal-desktop-bin-5.38.0
rename to metadata/md5-cache/net-im/signal-desktop-bin-5.39.0
index 1bf3766c6b05..95c63ef47bc6 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.38.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.39.0
@@ -8,6 +8,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf:2 x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.38.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.39.0_amd64.deb
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f96d7557a20fe2bdf2fb6af689ba7ef3
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.4.8 b/metadata/md5-cache/net-im/telegram-desktop-3.4.8
deleted file mode 100644
index 03d44c04c96a..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-3.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=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-util/cmake-3.16 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/libdispatch dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20211129 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20211207[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3*
-DESCRIPTION=Official desktop client for Telegram
-EAPI=8
-HOMEPAGE=https://desktop.telegram.org
-IUSE=+dbus enchant +hunspell screencast +spell wayland +X
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/libdispatch dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20211129 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20211207[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.4.8/tdesktop-3.4.8-full.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=851ee8502f51204f63f925c68f0503fd
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.5.2-r1 b/metadata/md5-cache/net-im/telegram-desktop-3.5.2-r1
index acab739ea647..75eb07780234 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-3.5.2-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-3.5.2-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.5.2/tdesktop-3.5.2-full.tar.gz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f869142c38be0d82d30a5e2b30b8e402
+_md5_=302a5cfedbc3fbf24b00fcbd0dd91009
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.6.1 b/metadata/md5-cache/net-im/telegram-desktop-3.6.1
index 04eb0003c92c..c6c1b7df9df2 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-3.6.1
+++ b/metadata/md5-cache/net-im/telegram-desktop-3.6.1
@@ -12,4 +12,4 @@ REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.6.1/tdesktop-3.6.1-full.tar.gz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=db16402bdc58922c0870a11482ca5ad6
+_md5_=00877a2e8511462213c1df7b46555374
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 54dcfd7efc2f..f5c571e5e63f 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r4 b/metadata/md5-cache/net-irc/ngircd-26.1-r4
index 4e2fd18c0826..43272c4d1909 100644
--- a/metadata/md5-cache/net-irc/ngircd-26.1-r4
+++ b/metadata/md5-cache/net-irc/ngircd-26.1-r4
@@ -5,11 +5,11 @@ DESCRIPTION=An IRC server written from scratch
 EAPI=8
 HOMEPAGE=https://ngircd.barton.de/
 IUSE=debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib verify-sig
-KEYWORDS=amd64 ~arm arm64 x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=acct-user/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz verify-sig? ( https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz.sig )
 _eclasses_=tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=c71144d5df438f77fa412f049bcc3b7d
+_md5_=560b7c84279e5f1f219db809651c4102
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 002ca2862fa0..3767c0e1c621 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/remmina-1.4.25 b/metadata/md5-cache/net-misc/remmina-1.4.25
index c58787ee642f..f640df32f532 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.25
+++ b/metadata/md5-cache/net-misc/remmina-1.4.25
@@ -5,10 +5,10 @@ DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
 EAPI=7
 HOMEPAGE=https://remmina.org/
 IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) x2go? ( net-misc/pyhoca-cli ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.25/Remmina-v1.4.25.tar.gz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=32a7b11d676c5e083ba164e3a8b0ca09
+_md5_=f5f138f805fd09ba1215e8df4613ba63
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 0fb044765c40..13d166829dc7 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.6.10 b/metadata/md5-cache/net-vpn/tor-0.4.6.10
index 530b801b3d71..09ddd31eb466 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.6.10
+++ b/metadata/md5-cache/net-vpn/tor-0.4.6.10
@@ -5,11 +5,11 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=8
 HOMEPAGE=https://www.torproject.org/
 IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.6.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.6.10.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.6.10.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.6.10.tar.gz.sha256sum.asc )
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=dbce9d84b3ccac072f96e6f3a82a614e
+_md5_=5732e128cede6b352a447d9be66e8f9d
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b8864d2cb164..9d947b107e8c 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/p4est-2.8.0-r1 b/metadata/md5-cache/sci-libs/p4est-2.8.0-r1
index 54dd2ff4cef5..16c2440de380 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.8.0-r1
+++ b/metadata/md5-cache/sci-libs/p4est-2.8.0-r1
@@ -11,4 +11,4 @@ RDEPEND=~sci-libs/libsc-2.8.3[mpi=,openmp=,threads=] sys-apps/util-linux virtual
 SLOT=0
 SRC_URI=https://github.com/cburstedde/p4est/archive/v2.8.tar.gz -> p4est-2.8.0.tar.gz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f53432b6ae4a2f260728d208a84862bc
+_md5_=fd99e6b616ac92443664351ffd539507
diff --git a/metadata/md5-cache/sci-libs/p4est-9999 b/metadata/md5-cache/sci-libs/p4est-9999
index c9b834c6c229..4d2b58511bb9 100644
--- a/metadata/md5-cache/sci-libs/p4est-9999
+++ b/metadata/md5-cache/sci-libs/p4est-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=~sci-libs/libsc-2.8.3[mpi=,openmp=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio] )
 SLOT=0
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c932f33e5f94ea6167484bca786b5f88
+_md5_=2f69a9f505d49fdf078f0ac3ee94708e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b74679a8f07c..beefecc905f6 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/dog-1.7-r6 b/metadata/md5-cache/sys-apps/dog-1.7-r6
index 96c8d1f5915a..d8b394ea197d 100644
--- a/metadata/md5-cache/sys-apps/dog-1.7-r6
+++ b/metadata/md5-cache/sys-apps/dog-1.7-r6
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Dog is better than cat
 EAPI=6
-HOMEPAGE=https://packages.gentoo.org/package/sys-apps/dog
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 ~arm64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/dog-1.7.tar.gz
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ab3547047db4492be80bcab0446f27f7
+_md5_=c3087e9ac93a9f7d332aece4168ad8ae
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.30-r2 b/metadata/md5-cache/sys-apps/portage-3.0.30-r2
new file mode 100644
index 000000000000..1c65cfe13d74
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.30-r2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[bzip2(+),threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=The package management and distribution system for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/file-5.41 >=sys-apps/coreutils-6.4 )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sec-keys/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[bzip2(+),threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.30.tar.bz2
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	8b7b99d1e4401a7a903cdfe1d2bf29de	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=8789a7d96f7bdc342509d14b684f241c
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 9c4cf6c3238d..87ba91d8aeb9 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/fio-3.30 b/metadata/md5-cache/sys-block/fio-3.30
index 29e8dbe7db97..6f5a6cb08258 100644
--- a/metadata/md5-cache/sys-block/fio-3.30
+++ b/metadata/md5-cache/sys-block/fio-3.30
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/fio-3.30.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=eecd0612f0d1b1fe408fbec36b646f45
+_md5_=1e10357165f602082695bb4b56693b74
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index b9c811be24c5..c7b212d1b816 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/os-prober-1.79-r2 b/metadata/md5-cache/sys-boot/os-prober-1.79-r2
index ae93833a3645..3d68215b2e24 100644
--- a/metadata/md5-cache/sys-boot/os-prober-1.79-r2
+++ b/metadata/md5-cache/sys-boot/os-prober-1.79-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Utility to detect other OSs on a set of drives
 EAPI=8
 HOMEPAGE=https://salsa.debian.org/installer-team/os-prober
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=sys-boot/grub:2[mount]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.79.tar.xz
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=98a7b519403c8f2df87b3a3910d1b98b
+_md5_=0162e877bea8003f2f892de5fd6ea1d2
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index cfb37364f709..4f0512e7261a 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/autoconf-2.71-r1 b/metadata/md5-cache/sys-devel/autoconf-2.71-r1
index 782252e02938..3879fb03fc52 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.71-r1
+++ b/metadata/md5-cache/sys-devel/autoconf-2.71-r1
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/autoconf-2.71:2.5
 SLOT=2.71
-SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz
+SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.71.tar.xz
 _eclasses_=toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
-_md5_=0d764ed45ce60200f1316066ae1cd173
+_md5_=c540721a3b271567bf2317dc5e9c0fc6
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 5060fc8ccefa..3a8960e0618d 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/pwdb-0.62-r2 b/metadata/md5-cache/sys-libs/pwdb-0.62-r2
index 79e4a7bb57d1..fab682b3f707 100644
--- a/metadata/md5-cache/sys-libs/pwdb-0.62-r2
+++ b/metadata/md5-cache/sys-libs/pwdb-0.62-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=install prepare
 DEPEND=net-libs/libnsl:0= net-libs/libtirpc selinux? ( sys-libs/libselinux )
 DESCRIPTION=Password database
 EAPI=7
-HOMEPAGE=https://packages.gentoo.org/package/sys-libs/pwdb
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=selinux split-usr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/pwdb-0.62.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=56a52b55fc1890181e6339b864b33cb1
+_md5_=431980f223090d6526ba7a57a603f044
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 39e9cbb262ed..2c56a1c9b0ae 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
index 784b01548a0b..c0ee631b1e7b 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.105.200
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=7
-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
+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
 RDEPEND=|| ( =dev-lang/perl-5.34.0* ~perl-core/Module-CoreList-5.202.105.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.105.200 !>perl-core/Module-CoreList-5.202.105.200-r999
 SLOT=0
-_md5_=815f68e83f96ed0aba68fcb47a97a1c7
+_md5_=2b71ef4c395b55b9592e623c3aca0d20
diff --git a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r5 b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r5
index f6aef0850144..e20a70710a23 100644
--- a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r5
+++ b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Thread-Semaphore
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin
+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
 RDEPEND=|| ( =dev-lang/perl-5.34* =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Thread-Semaphore-2.130.0 ) dev-lang/perl:= !<perl-core/Thread-Semaphore-2.130.0 !>perl-core/Thread-Semaphore-2.130.0-r999
 SLOT=0
-_md5_=49286e2bf9b2c8308c1a24b414f3809f
+_md5_=9552692f125ac76ed6d63efcc5c30ea8
diff --git a/metadata/md5-cache/virtual/rubygems-15 b/metadata/md5-cache/virtual/rubygems-15
index 454c984f5f80..89974a8849e3 100644
--- a/metadata/md5-cache/virtual/rubygems-15
+++ b/metadata/md5-cache/virtual/rubygems-15
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=6
 IUSE=ruby_targets_ruby26
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 )
 SLOT=0
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=9c8214b475ecc672c7a02a764f1a47d9
+_md5_=adbb34996e8906fbb77f3ed4118cda69
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d3a72c21e3bd..d63ceb00db3b 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-100.0.4896.127 b/metadata/md5-cache/www-client/chromium-100.0.4896.127
new file mode 100644
index 000000000000..ec10cf42c1bc
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-100.0.4896.127
@@ -0,0 +1,15 @@
+BDEPEND=system-icu? ( >=dev-libs/icu-69.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X] ) x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] >=dev-lang/python-3.9.9-r1:3.9[xml] >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=system-icu? ( >=dev-libs/icu-69.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X] ) x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( x11-libs/gdk-pixbuf:2 x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= virtual/opengl >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 cups? ( >=net-print/cups-1.3.11:= ) sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X,wayland?] ) )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=system-icu? ( >=dev-libs/icu-69.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X] ) x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( x11-libs/gdk-pixbuf:2 x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= virtual/opengl >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 cups? ( >=net-print/cups-1.3.11:= ) sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) ) x11-misc/xdg-utils virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
+REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland )
+SLOT=0/stable
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-100.0.4896.127.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-100-patchset-4/chromium-100-patchset-4.tar.xz ppc64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-100-patchset-ppc64le-1.tar.xz )
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	8b7b99d1e4401a7a903cdfe1d2bf29de	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5078b378ff359f12fc5e4d72cc267d03
diff --git a/metadata/md5-cache/www-client/google-chrome-100.0.4896.88 b/metadata/md5-cache/www-client/google-chrome-100.0.4896.127
similarity index 96%
rename from metadata/md5-cache/www-client/google-chrome-100.0.4896.88
rename to metadata/md5-cache/www-client/google-chrome-100.0.4896.127
index 9dc2c44f62af..58a7e3fd35c4 100644
--- a/metadata/md5-cache/www-client/google-chrome-100.0.4896.88
+++ b/metadata/md5-cache/www-client/google-chrome-100.0.4896.127
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_100.0.4896.88-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_100.0.4896.127-1_amd64.deb
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	8b7b99d1e4401a7a903cdfe1d2bf29de	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f54ebfc7ec61e07d3a5f568bc5cc23e3
diff --git a/metadata/md5-cache/www-client/opera-beta-86.0.4363.9 b/metadata/md5-cache/www-client/opera-beta-86.0.4363.17
similarity index 78%
rename from metadata/md5-cache/www-client/opera-beta-86.0.4363.9
rename to metadata/md5-cache/www-client/opera-beta-86.0.4363.17
index 650655be565c..2d821405b67c 100644
--- a/metadata/md5-cache/www-client/opera-beta-86.0.4363.9
+++ b/metadata/md5-cache/www-client/opera-beta-86.0.4363.17
@@ -8,6 +8,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/86.0.4363.9/linux/opera-beta_86.0.4363.9_amd64.deb https://download2.operacdn.com/pub/opera-beta/86.0.4363.9/linux/opera-beta_86.0.4363.9_amd64.deb https://download3.operacdn.com/pub/opera-beta/86.0.4363.9/linux/opera-beta_86.0.4363.9_amd64.deb https://download4.operacdn.com/pub/opera-beta/86.0.4363.9/linux/opera-beta_86.0.4363.9_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/86.0.4363.17/linux/opera-beta_86.0.4363.17_amd64.deb https://download2.operacdn.com/pub/opera-beta/86.0.4363.17/linux/opera-beta_86.0.4363.17_amd64.deb https://download3.operacdn.com/pub/opera-beta/86.0.4363.17/linux/opera-beta_86.0.4363.17_amd64.deb https://download4.operacdn.com/pub/opera-beta/86.0.4363.17/linux/opera-beta_86.0.4363.17_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	8b7b99d1e4401a7a903cdfe1d2bf29de	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=38ad1556b6fb9daf5f944e36d3369844
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 3834fa79e6f3..d6cafc0c6c0d 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-100.0.4896.88 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-100.0.4896.127
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-100.0.4896.88
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-100.0.4896.127
index 4a2d55220fa4..bb19b64388d6 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-100.0.4896.88
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-100.0.4896.127
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_100.0.4896.88-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_100.0.4896.127-1_amd64.deb
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
 _md5_=63079fa95734c111159210df04e4b0cb
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 55d7fe46c12f..b7c041de7dfc 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-1.0.0 b/metadata/md5-cache/x11-libs/libfm-qt-1.0.0
index aadbf4047e2f..7ea7e278cc3f 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-1.0.0
+++ b/metadata/md5-cache/x11-libs/libfm-qt-1.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5= >=dev-qt/qt
 DESCRIPTION=Qt Library for Building File Managers
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5= >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=lxde-base/menu-cache-1.1.0:= media-libs/libexif x11-libs/libxcb:=
 SLOT=0/7
 SRC_URI=https://github.com/lxqt/libfm-qt/releases/download/1.0.0/libfm-qt-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=91e913b36273f629f6a48b18c949ce6e
+_md5_=55da5dee9c69572f8101d405889952bd
diff --git a/metadata/md5-cache/x11-libs/pango-1.50.7 b/metadata/md5-cache/x11-libs/pango-1.50.7
new file mode 100644
index 000000000000..d3ae25cca116
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/pango-1.50.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils sys-apps/help2man virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.62.2: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(-)?] >=dev-libs/fribidi-1.0.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(-)?] >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13.0:1.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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Internationalized text layout and rendering library
+EAPI=7
+HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
+IUSE=debug +introspection sysprof 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 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.62.2: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(-)?] >=dev-libs/fribidi-1.0.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(-)?] >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13.0:1.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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.50/pango-1.50.7.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=84c8337e10d634940076f4f5deef7793
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-1.0.0 b/metadata/md5-cache/x11-libs/qtermwidget-1.0.0
index 4c9223421415..f746ed8cdd37 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-1.0.0
+++ b/metadata/md5-cache/x11-libs/qtermwidget-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5
 DESCRIPTION=Qt terminal emulator widget
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD GPL-2 LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5
 SLOT=0/1.0.0
 SRC_URI=https://github.com/lxqt/qtermwidget/releases/download/1.0.0/qtermwidget-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d5dac504b6a8b46bc92322dbe5319fa1
+_md5_=bb8cad8a22fc8d50ba8252db0c812b86
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e267953ff2ed..63023e6874da 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/iconbox-0.2 b/metadata/md5-cache/x11-misc/iconbox-0.2
index ba02e9d1dea1..df39faf51815 100644
--- a/metadata/md5-cache/x11-misc/iconbox-0.2
+++ b/metadata/md5-cache/x11-misc/iconbox-0.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=App for placing icons in a menu which auto-hides
 EAPI=7
-HOMEPAGE=https://packages.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Gtk2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://gentoo/iconbox_0.2.tar.gz
-_md5_=267d4836a66ce0161211b9a931ac4aa3
+_md5_=6a72e617911621f44f3efc31184f6d0a
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-1.0.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-1.0.0
index ba4628607d94..c0e167a8299f 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-1.0.0
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-1.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qt
 DESCRIPTION=Qt GUI Tabbed Filemanager
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 sys-apps/util-linux virtual/freedesktop-icon-theme =x11-libs/libfm-qt-1.0*:= x11-libs/libxcb:= x11-misc/xdg-utils >=lxde-base/lxmenu-data-0.1.5
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/1.0.0/pcmanfm-qt-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8c9dc35e424af92ecf211faca3a68f09
+_md5_=5a532f0dde0b6f611cc398eb1a85a040
diff --git a/metadata/md5-cache/x11-misc/qps-2.4.0-r1 b/metadata/md5-cache/x11-misc/qps-2.4.0-r1
index 35ae3263fc21..bcd2bb7728f2 100644
--- a/metadata/md5-cache/x11-misc/qps-2.4.0-r1
+++ b/metadata/md5-cache/x11-misc/qps-2.4.0-r1
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev
 DESCRIPTION=Qt GUI Process Manager
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=lxqt-base/liblxqt-1:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/qps/releases/download/2.4.0/qps-2.4.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6cd38787c1dd5056bea5a99af61a8c31
+_md5_=e57a5b2c3372accbcaa160dd9382eaa8
diff --git a/metadata/md5-cache/x11-misc/screengrab-2.3.0 b/metadata/md5-cache/x11-misc/screengrab-2.3.0
index be23da94bfec..b302a201fd0f 100644
--- a/metadata/md5-cache/x11-misc/screengrab-2.3.0
+++ b/metadata/md5-cache/x11-misc/screengrab-2.3.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.7.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >
 DESCRIPTION=Qt GUI Screenshot Utility
 EAPI=8
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.7.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libxcb:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/screengrab/releases/download/2.3.0/screengrab-2.3.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=574aeb0951e145ccb0e5fccc4616a969
+_md5_=4a889f8062ed712b25c6a1aea1130de6
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index ab7eae8fe360..fcd2e306e154 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/qterminal-1.0.0 b/metadata/md5-cache/x11-terms/qterminal-1.0.0
index e1b71419316b..28fcf9f1ec15 100644
--- a/metadata/md5-cache/x11-terms/qterminal-1.0.0
+++ b/metadata/md5-cache/x11-terms/qterminal-1.0.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev
 DESCRIPTION=Qt-based multitab terminal emulator
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 x11-libs/libX11 ~x11-libs/qtermwidget-1.0.0:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/qterminal/releases/download/1.0.0/qterminal-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9d33915cab81b3032289117efbba4aec
+_md5_=f0a166258e1f475dd7a1a4f316a46f28
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 41b205eaceba..a52ddb7a119f 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/lxqt-themes-1.0.0 b/metadata/md5-cache/x11-themes/lxqt-themes-1.0.0
index 4bf2e4ad6013..c7c84b5e66f6 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-1.0.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-1.0.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DESCRIPTION=LXQt Themes
 EAPI=8
 HOMEPAGE=https://lxqt-project.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-themes/releases/download/1.0.0/lxqt-themes-1.0.0.tar.xz
 _eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=656fef68596cd061529212a3369b78c2
+_md5_=39f3e7e0adf4b3fafc559d9b628e90dc
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2252152b5d52..566f83262d90 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Apr 2022 05:39:21 +0000
+Fri, 15 Apr 2022 09:39:21 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3cef59e7f2ba..7c4dbe5e83f9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Apr 15 05:39:21 AM UTC 2022
+Fri Apr 15 09:39:21 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f4afa4f68122..9577b467adc6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Apr 2022 06:00:01 +0000
+Fri, 15 Apr 2022 10:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 990bb8b8adad..e19fb54f888d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-bdaf744ea7f5988ff259538b5a6fafdd93fddbf6 1650000902 2022-04-15T05:35:02+00:00
+8d30584fc65bbc6eb9ccae6350a1859a794cf87d 1650014497 2022-04-15T09:21:37+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9437101dda0a..03907de99647 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1650001201 Fri 15 Apr 2022 05:40:01 AM UTC
+1650015601 Fri 15 Apr 2022 09:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2252152b5d52..566f83262d90 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Apr 2022 05:39:21 +0000
+Fri, 15 Apr 2022 09:39:21 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index f0caded41683..0fe8171e3e75 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 023c549840af..2bfc8dbf3403 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_5.38.0_amd64.deb 115063872 BLAKE2B 591656ad711489c338a8b99bd93d569ad6b52a1bac3f5413ee533656f767e35b564e506e10f503ab5091adbce44485f1be3bdaa7e33f836bd55f01a6a5f459c8 SHA512 09bb2cbc8a1f2194840d64a1eeecb58e79d8f5e0a60eedbcad0a05acfc234551f2b207668afaded770f4b94c54706e7131e1664b804738a927f7c552080c5add
+DIST signal-desktop_5.39.0_amd64.deb 115958662 BLAKE2B 0c6b1ba978374e6ea2c0ac28851aa8767a0d878d2fcc4b6249e232cbf7f7489c05384ecc70412aa692f3880f267c7e5855e125b213f82f6811706fb279eb90ee SHA512 9322f0f5b5241b556239b8daa2c4b35409c0fcafc652eaea65245dc385170672fdcd1e0358a817eb4493c0bb863c6710244c62f701f1660d777b6b11c6f0b8db
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.38.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.39.0.ebuild
similarity index 100%
rename from net-im/signal-desktop-bin/signal-desktop-bin-5.38.0.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-5.39.0.ebuild
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index ef2b9c7bb618..5e1ddfb6238b 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST tdesktop-3.4.8-full.tar.gz 41220984 BLAKE2B e75e7d7432a863e7a35b73bb2a378970f8aab74d99a425e631947fd894e51d931ee2390e2f885831d165d73541cf2151840467e2ef02ece175cc6a18f3e2c81c SHA512 cdeb5a83a375a494d805bf4198beee1c4bfc94bd9626535721a0cf04a590c70bfdb20e76baaa2a4c8c6db54c5813f22ce2a8c6291786b6b6db3dcde10b266fe1
 DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
 DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba
diff --git a/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch
deleted file mode 100644
index e99cd2e4bf91..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Only link jemalloc for the Telegram binary
-
-Some combination of factors is making the different codegen tools hang when
-jemalloc is linked for those, and they're ran under portage's sandbox. Since
-this is only used during build-time, and jemalloc is merely necessary to
-improve runtime memory use, it's unnecessary to use it for anything else.
-
---- tdesktop-3.4.8-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.4.8-full/Telegram/CMakeLists.txt
-@@ -1331,6 +1331,11 @@
-         endif()
-     endif()
- else()
-+    target_link_libraries(Telegram
-+    PRIVATE
-+        desktop-app::external_jemalloc
-+    )
-+
-     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-         target_link_libraries(Telegram
-         PRIVATE
---- tdesktop-3.4.8-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.4.8-full/cmake/options_linux.cmake
-@@ -65,7 +65,6 @@
- 
- target_link_libraries(common_options
- INTERFACE
--    desktop-app::external_jemalloc
-     ${CMAKE_DL_LIBS}
- )
- 
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
new file mode 100644
index 000000000000..e818ffe46456
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
@@ -0,0 +1,55 @@
+Fix compatibility with kwayland-5.93.0
+
+The header files were moved, the include directory wasn't being added correctly.
+
+https://bugs.gentoo.org/837569
+
+--- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
++++ tdesktop-3.6.1-full/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+@@ -9,10 +9,10 @@
+ 
+ #include "base/platform/base_platform_info.h"
+ 
+-#include <connection_thread.h>
+-#include <registry.h>
+-#include <surface.h>
+-#include <plasmashell.h>
++#include <KWayland/Client/connection_thread.h>
++#include <KWayland/Client/registry.h>
++#include <KWayland/Client/surface.h>
++#include <KWayland/Client/plasmashell.h>
+ 
+ using namespace KWayland::Client;
+ 
+--- tdesktop-3.6.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
++++ tdesktop-3.6.1-full/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
+@@ -13,11 +13,11 @@
+ #include <QtCore/QPointer>
+ #include <QtGui/QWindow>
+ 
+-#include <connection_thread.h>
+-#include <registry.h>
+-#include <surface.h>
+-#include <xdgforeign.h>
+-#include <idleinhibit.h>
++#include <KWayland/Client/connection_thread.h>
++#include <KWayland/Client/registry.h>
++#include <KWayland/Client/surface.h>
++#include <KWayland/Client/xdgforeign.h>
++#include <KWayland/Client/idleinhibit.h>
+ 
+ using namespace KWayland::Client;
+ 
+--- tdesktop-3.6.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
++++ tdesktop-3.6.1-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
+@@ -24,8 +24,8 @@
+ #include <private/qwaylandwindow_p.h>
+ #include <private/qwaylandshellsurface_p.h>
+ 
+-#include <connection_thread.h>
+-#include <registry.h>
++#include <KWayland/Client/connection_thread.h>
++#include <KWayland/Client/registry.h>
+ 
+ Q_DECLARE_METATYPE(QMargins);
+ 
diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
deleted file mode 100644
index ce7da5f009ff..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1 optfeature flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-libs/jemalloc:=[-lazy-lock]
-	dev-libs/libdispatch
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
-	>=dev-qt/qtimageformats-5.15:5
-	>=dev-qt/qtnetwork-5.15:5[ssl]
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5[png,X?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20211129
-	media-libs/openal
-	media-libs/opus:=
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20211207[screencast=,X=]
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-cpp/glibmm:2
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-PATCHES=(
-	"${FILESDIR}/tdesktop-3.4.8-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
-)
-
-# Current desktop-file-utils-0.26 does not understand Version=1.5
-QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-		-DDESKTOP_APP_QT6=OFF
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	# Fix for RISCV, as well as any other platforms that might generate libatomic calls
-	# Upstreamed in >3.4.3
-	append-ldflags '-pthread'
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use X && ! use screencast; then
-		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
-	fi
-	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
-		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
-		ewarn "to crash when pasting big images from the clipboard."
-	fi
-	optfeature_header
-	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
index fd97841de5b2..e5bd2fb2c389 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
 	"${FILESDIR}/tdesktop-3.5.2-musl.patch"
 	"${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch"
+	"${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch"
 )
 
 # Current desktop-file-utils-0.26 does not understand Version=1.5
diff --git a/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild
index 5d77d8964fd7..d2fc536e145f 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
 	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
 	"${FILESDIR}/tdesktop-3.5.2-musl.patch"
 	"${FILESDIR}/tdesktop-3.6.0-support-ffmpeg5.patch"
+	"${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch"
 )
 
 # Current desktop-file-utils-0.26 does not understand Version=1.5
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e3667c01ff2b..bf51c5f6d5f3 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/ngircd/ngircd-26.1-r4.ebuild b/net-irc/ngircd/ngircd-26.1-r4.ebuild
index 26eb418a5ef3..383cb5fad69a 100644
--- a/net-irc/ngircd/ngircd-26.1-r4.ebuild
+++ b/net-irc/ngircd/ngircd-26.1-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
 
 # Flaky test needs investigation (bug 719256)
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index cc256565e016..96678397c189 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/remmina/remmina-1.4.25.ebuild b/net-misc/remmina/remmina-1.4.25.ebuild
index 8e269e89a576..9b772915c4d2 100644
--- a/net-misc/remmina/remmina-1.4.25.ebuild
+++ b/net-misc/remmina/remmina-1.4.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
 
 COMMON_DEPEND="
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 569ac4be2c4f..4921d5013f9f 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tor/tor-0.4.6.10.ebuild b/net-vpn/tor/tor-0.4.6.10.ebuild
index 82201780a670..f84054aac604 100644
--- a/net-vpn/tor/tor-0.4.6.10.ebuild
+++ b/net-vpn/tor/tor-0.4.6.10.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 469dc90b93fc..13d7dca8d9c3 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index cace21a93853..46847344892e 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
@@ -27,3 +27,4 @@ virtual/rust
 gnome-base/gdm
 gnome-extra/chrome-gnome-shell
 gnome-extra/gnome-tweaks
+>=media-libs/freetype-2.12.0
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index cace21a93853..46847344892e 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
@@ -27,3 +27,4 @@ virtual/rust
 gnome-base/gdm
 gnome-extra/chrome-gnome-shell
 gnome-extra/gnome-tweaks
+>=media-libs/freetype-2.12.0
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index 79fab2dd73b3..c63fbc970fa1 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
@@ -27,3 +27,4 @@ virtual/rust
 gnome-base/gdm
 gnome-extra/chrome-gnome-shell
 gnome-extra/gnome-tweaks
+>=media-libs/freetype-2.12.0
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4986477cebab..57b30f28caa6 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/p4est/p4est-2.8.0-r1.ebuild b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
index 2e803199a24b..177d7985ea02 100644
--- a/sci-libs/p4est/p4est-2.8.0-r1.ebuild
+++ b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index d27a0814359b..41605b7be0f7 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 78a1fb014ba5..94b2106585ff 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/selinux-ccs/Manifest.gz b/sec-policy/selinux-ccs/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-ccs/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-ccs/metadata.xml b/sec-policy/selinux-ccs/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-ccs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-clockspeed/Manifest.gz b/sec-policy/selinux-clockspeed/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-clockspeed/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-clockspeed/metadata.xml b/sec-policy/selinux-clockspeed/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-clockspeed/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-dcc/Manifest.gz b/sec-policy/selinux-dcc/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-dcc/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-dcc/metadata.xml b/sec-policy/selinux-dcc/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-dcc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-ddcprobe/Manifest.gz b/sec-policy/selinux-ddcprobe/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-ddcprobe/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-ddcprobe/metadata.xml b/sec-policy/selinux-ddcprobe/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-ddcprobe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-denyhosts/Manifest.gz b/sec-policy/selinux-denyhosts/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-denyhosts/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-denyhosts/metadata.xml b/sec-policy/selinux-denyhosts/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-denyhosts/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-howl/Manifest.gz b/sec-policy/selinux-howl/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-howl/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-howl/metadata.xml b/sec-policy/selinux-howl/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-howl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-imaze/Manifest.gz b/sec-policy/selinux-imaze/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-imaze/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-imaze/metadata.xml b/sec-policy/selinux-imaze/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-imaze/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-kudzu/Manifest.gz b/sec-policy/selinux-kudzu/Manifest.gz
deleted file mode 100644
index 6fdd81bb8033..000000000000
Binary files a/sec-policy/selinux-kudzu/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-kudzu/metadata.xml b/sec-policy/selinux-kudzu/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-kudzu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-lockdev/Manifest.gz b/sec-policy/selinux-lockdev/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-lockdev/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-lockdev/metadata.xml b/sec-policy/selinux-lockdev/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-lockdev/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-pcmcia/Manifest.gz b/sec-policy/selinux-pcmcia/Manifest.gz
deleted file mode 100644
index 6fdd81bb8033..000000000000
Binary files a/sec-policy/selinux-pcmcia/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-pcmcia/metadata.xml b/sec-policy/selinux-pcmcia/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-pcmcia/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-podsleuth/Manifest.gz b/sec-policy/selinux-podsleuth/Manifest.gz
deleted file mode 100644
index 6fdd81bb8033..000000000000
Binary files a/sec-policy/selinux-podsleuth/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-podsleuth/metadata.xml b/sec-policy/selinux-podsleuth/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-podsleuth/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-pyicqt/Manifest.gz b/sec-policy/selinux-pyicqt/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-pyicqt/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-pyicqt/metadata.xml b/sec-policy/selinux-pyicqt/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-pyicqt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-rgmanager/Manifest.gz b/sec-policy/selinux-rgmanager/Manifest.gz
deleted file mode 100644
index 3b1b323770f5..000000000000
Binary files a/sec-policy/selinux-rgmanager/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-rgmanager/metadata.xml b/sec-policy/selinux-rgmanager/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-rgmanager/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-roundup/Manifest.gz b/sec-policy/selinux-roundup/Manifest.gz
deleted file mode 100644
index 6fdd81bb8033..000000000000
Binary files a/sec-policy/selinux-roundup/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-roundup/metadata.xml b/sec-policy/selinux-roundup/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-roundup/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-speedtouch/Manifest.gz b/sec-policy/selinux-speedtouch/Manifest.gz
deleted file mode 100644
index 6fdd81bb8033..000000000000
Binary files a/sec-policy/selinux-speedtouch/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-speedtouch/metadata.xml b/sec-policy/selinux-speedtouch/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-speedtouch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-xprint/Manifest.gz b/sec-policy/selinux-xprint/Manifest.gz
deleted file mode 100644
index 6fdd81bb8033..000000000000
Binary files a/sec-policy/selinux-xprint/Manifest.gz and /dev/null differ
diff --git a/sec-policy/selinux-xprint/metadata.xml b/sec-policy/selinux-xprint/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-xprint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a06c140f67f8..cbe9c643e0ce 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/dog/dog-1.7-r6.ebuild b/sys-apps/dog/dog-1.7-r6.ebuild
index a01706d9785e..41f3a8dde798 100644
--- a/sys-apps/dog/dog-1.7-r6.ebuild
+++ b/sys-apps/dog/dog-1.7-r6.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=6
@@ -6,8 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Dog is better than cat"
-# the best HOMEPAGE we have.
-HOMEPAGE="https://packages.gentoo.org/package/sys-apps/dog"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/portage/files/3.0.30-qa-checks.patch b/sys-apps/portage/files/3.0.30-qa-checks.patch
new file mode 100644
index 000000000000..19290d352f49
--- /dev/null
+++ b/sys-apps/portage/files/3.0.30-qa-checks.patch
@@ -0,0 +1,137 @@
+Backport a bunch of QA notice changes so tinderboxes etc can pick them up,
+given portage.git is currently undergoing a fair bit of refactoring.
+
+https://github.com/gentoo/portage/commit/7b44116b4a669a49e51e5a495ab62a25229e18e4
+https://github.com/gentoo/portage/commit/8ded447a1d194ad0190a174f7bb330417685d861
+https://github.com/gentoo/portage/commit/23c4a45827fccebb969d5130ccc234ed3d1a9b35
+https://github.com/gentoo/portage/commit/3994939f982f22afbc7aaf3b8eca6680ad85c617
+
+From: Sam James <sam@gentoo.org>
+Date: Sat, 2 Apr 2022 05:10:31 +0100
+Subject: [PATCH] bin/install-qa-check.d/95empty-dirs: update message for EAPI
+ 8
+
+Portage changed the default for >= EAPI 8 ("newer EAPIs" at the time, not
+actually specific to 8) in bfda0d2bd4ba03a4e77f488ec3fd4f9c6c351662 to
+enable FEATURES="strict-keepdir".
+
+Signed-off-by: Sam James <sam@gentoo.org>
+Closes: https://github.com/gentoo/portage/pull/802
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/install-qa-check.d/95empty-dirs
++++ b/bin/install-qa-check.d/95empty-dirs
+@@ -33,7 +33,7 @@ find_empty_dirs() {
+ 		done
+ 		eqawarn
+ 		eqawarn "If those directories need to be preserved, please make sure to create"
+-		eqawarn "or mark them for keeping using 'keepdir'. Future versions of Portage"
++		eqawarn "or mark them for keeping using 'keepdir'. Portage for >= EAPI 8 ebuilds"
+ 		eqawarn "will strip empty directories from installation image."
+ 	fi
+ }
+
+
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 10 Apr 2022 17:51:02 +0100
+Subject: [PATCH] install-qa-check.d/20runtime-directories: warn on /var/tmp
+ too
+
+Bug: https://bugs.gentoo.org/493154
+Bug: https://bugs.gentoo.org/837536
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/install-qa-check.d/20runtime-directories
++++ b/bin/install-qa-check.d/20runtime-directories
+@@ -1,10 +1,10 @@
+ # Check for directories that need to be created at runtime
+ 
+ runtime_dir_check() {
+-	# It's ok create these directories, but not to install into them. #493154
++	# It's ok to create these directories, but not to install into them. #493154
+ 	# TODO: We should add var/lib to this list.
+ 	local x f=
+-	for x in var/cache var/lock var/run run ; do
++	for x in var/cache var/lock var/run var/tmp run ; do
+ 		if [[ ! -L ${ED}/${x} && -d ${ED}/${x} ]] ; then
+ 			if [[ -z $(find "${ED}/${x}" -prune -empty) ]] ; then
+ 				f+=$(cd "${ED}"; find "${x}" -printf '  %p\n')
+
+From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
+Date: Mon, 11 Apr 2022 15:46:06 +0200
+Subject: [PATCH] eend: Output QA warning if ebegin has not been called
+
+The assumption here is that ebegin-eend aren't nested.
+
+Closes: https://bugs.gentoo.org/835824
+Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
+Closes: https://github.com/gentoo/portage/pull/807
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/isolated-functions.sh
++++ b/bin/isolated-functions.sh
+@@ -339,6 +339,7 @@ ebegin() {
+ 	[[ ${RC_ENDCOL} == "yes" ]] && echo >&2
+ 	LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} ))
+ 	LAST_E_CMD="ebegin"
++	EBEGIN_EEND=1
+ 	return 0
+ }
+ 
+@@ -367,6 +368,11 @@ __eend() {
+ 
+ eend() {
+ 	[[ -n $1 ]] || eqawarn "QA Notice: eend called without first argument"
++	if [[ -v EBEGIN_EEND ]] ; then
++		unset EBEGIN_EEND
++	else
++		eqawarn "QA Notice: eend called without preceding ebegin (phase: ${EBUILD_PHASE})"
++	fi
+ 	local retval=${1:-0}
+ 	shift
+ 
+
+From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
+Date: Tue, 12 Apr 2022 10:59:11 +0200
+Subject: [PATCH] ebegin: Output QA warning if call to eend is missing
+
+The idea here is to check if EBEGIN_EEND is set after the phase has been
+executed. If so, then a call to eend is probably missing. This is under
+the assumption that ebegin-eend invocations should be properly paired
+within the same phase.
+
+In ebegin, the EBEGIN_EEND variable is also checked, and, if set,
+indicates that ebegin has been called and is missing the closing call to
+eend.
+
+I doubt that this check is perfect, but it seems to work in what little
+testing I've done.
+
+Closes: https://bugs.gentoo.org/835823
+Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
+Closes: https://github.com/gentoo/portage/pull/811
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/isolated-functions.sh
++++ b/bin/isolated-functions.sh
+@@ -339,6 +339,9 @@ ebegin() {
+ 	[[ ${RC_ENDCOL} == "yes" ]] && echo >&2
+ 	LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} ))
+ 	LAST_E_CMD="ebegin"
++	if [[ -v EBEGIN_EEND ]] ; then
++		eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${EBUILD_PHASE})"
++	fi
+ 	EBEGIN_EEND=1
+ 	return 0
+ }
+--- a/bin/phase-functions.sh
++++ b/bin/phase-functions.sh
+@@ -1088,6 +1088,10 @@ __ebuild_main() {
+ 		;;
+ 	esac
+ 
++	if [[ -v EBEGIN_EEND ]] ; then
++		eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${1})"
++	fi
++
+ 	# Save the env only for relevant phases.
+ 	if ! has "${1}" clean help info nofetch ; then
+ 		umask 002
+
diff --git a/sys-apps/portage/files/3.0.30-revert-run-warn.patch b/sys-apps/portage/files/3.0.30-revert-run-warn.patch
new file mode 100644
index 000000000000..d5f20421695e
--- /dev/null
+++ b/sys-apps/portage/files/3.0.30-revert-run-warn.patch
@@ -0,0 +1,64 @@
+https://github.com/gentoo/portage/commit/1327fa9f829e8670c65ff35b9b0bda446991f7ed
+
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 14 Feb 2022 15:30:18 -0500
+Subject: [PATCH] Revert "lib/_emerge/actions.py: warn on missing /run"
+
+Portage itself does not need /run to be mounted.
+build-docbook-catalog was adjusted to create locks in /etc/xml instead.
+
+Bug: https://bugs.gentoo.org/832853
+Reverts: 0e9e12aadb889766d61c0561b9723e71542d43e6
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+Closes: https://github.com/gentoo/portage/pull/788
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/lib/_emerge/actions.py
++++ b/lib/_emerge/actions.py
+@@ -3020,25 +3020,17 @@ def validate_ebuild_environment(trees):
+     check_locale()
+ 
+ 
+-def check_mounted_fs():
+-    """We need /proc for finding CPU counts and finding other system information.
+-    We need /run for e.g. lock files in ebuilds."""
+-    paths = {"/proc": False, "/run": False}
+-
+-    for path in paths.keys():
+-        if platform.system() not in ("Linux",) or os.path.ismount(path):
+-            paths[path] = True
+-            continue
+-
+-        msg = "It seems %s is not mounted. Process management may malfunction." % path
+-        writemsg_level(
+-            "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)),
+-            level=logging.ERROR,
+-            noiselevel=-1,
+-        )
+-
+-    # Were all of the mounts we were looking for available?
+-    return all(paths.values())
++def check_procfs():
++    procfs_path = "/proc"
++    if platform.system() not in ("Linux",) or os.path.ismount(procfs_path):
++        return os.EX_OK
++    msg = "It seems that %s is not mounted. You have been warned." % procfs_path
++    writemsg_level(
++        "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)),
++        level=logging.ERROR,
++        noiselevel=-1,
++    )
++    return 1
+ 
+ 
+ def config_protect_check(trees):
+@@ -3516,8 +3508,7 @@ def run_action(emerge_config):
+         repo_name_check(emerge_config.trees)
+         repo_name_duplicate_check(emerge_config.trees)
+         config_protect_check(emerge_config.trees)
+-
+-    check_mounted_fs()
++    check_procfs()
+ 
+     for mytrees in emerge_config.trees.values():
+         mydb = mytrees["porttree"].dbapi
+
diff --git a/sys-apps/portage/portage-3.0.30-r2.ebuild b/sys-apps/portage/portage-3.0.30-r2.ebuild
new file mode 100644
index 000000000000..41d008c12f34
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.30-r2.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		>=app-shells/bash-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch"
+		"${FILESDIR}/3.0.30-revert-run-warn.patch"
+		"${FILESDIR}/3.0.30-qa-checks.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index a62f5eb50673..8d645712aff0 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/fio/fio-3.30.ebuild b/sys-block/fio/fio-3.30.ebuild
index 16e488400b63..0eb2039eda6c 100644
--- a/sys-block/fio/fio-3.30.ebuild
+++ b/sys-block/fio/fio-3.30.ebuild
@@ -148,7 +148,7 @@ src_install() {
 	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
 	rm "${ED}"/usr/bin/genfio || die
 
-	dodoc README REPORTING-BUGS HOWTO
+	dodoc README.rst REPORTING-BUGS HOWTO.rst
 	docinto examples
 	dodoc examples/*
 }
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 7be3fc3fb4f5..351c4e836037 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/os-prober/os-prober-1.79-r2.ebuild b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
index 1ae3cd3a476e..346cbb2f355a 100644
--- a/sys-boot/os-prober/os-prober-1.79-r2.ebuild
+++ b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git"
 else
 	SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}"/${PN}
 fi
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9a94bb0f7b49..05ca0b23c684 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/autoconf/autoconf-2.71-r1.ebuild b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
index 2421cf85b368..ee857f350922 100644
--- a/sys-devel/autoconf/autoconf-2.71-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
 	inherit git-r3
 else
@@ -11,12 +11,14 @@ else
 	MY_PV="${PV}"
 	MY_P="${PN}-${MY_PV}"
 	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
-	[[ "${PV}" == *_beta* ]] || \
-	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"
-	S="${WORKDIR}/${MY_P}"
+
+	if ! [[ ${PV} == *_beta* ]] ; then
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+	S="${WORKDIR}"/${MY_P}
 fi
 
 inherit toolchain-autoconf
@@ -34,7 +36,7 @@ RDEPEND="${BDEPEND}
 	>=sys-devel/autoconf-wrapper-15
 	sys-devel/gnuconfig
 	!~sys-devel/${P}:2.5"
-[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
 PATCHES=( "${FILESDIR}/${P}-time.patch" )
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d58f3d76c80d..fe1582b15d01 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/pwdb/pwdb-0.62-r2.ebuild b/sys-libs/pwdb/pwdb-0.62-r2.ebuild
index d44cdd852dd0..935c713d0a0a 100644
--- a/sys-libs/pwdb/pwdb-0.62-r2.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r2.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs flag-o-matic usr-ldscript
 
 DESCRIPTION="Password database"
-HOMEPAGE="https://packages.gentoo.org/package/sys-libs/pwdb"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 44086e613dd1..5f0553989f3d 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
index 366f41732ace..5e12470c2f0f 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-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"
+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"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r5.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r5.ebuild
index 72a9160bae77..960c30890719 100644
--- a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r5.ebuild
+++ b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
+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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34* =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/rubygems/rubygems-15.ebuild b/virtual/rubygems/rubygems-15.ebuild
index 36d1f894746e..b03bec21b605 100644
--- a/virtual/rubygems/rubygems-15.ebuild
+++ b/virtual/rubygems/rubygems-15.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=6
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] )"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 4df128b18835..61bd76382cde 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index cc94fc004563..0019594d40e9 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
 DIST chromium-100-patchset-4.tar.xz 5676 BLAKE2B aaa96413cc44ea75d2664b7d85130ca6f9ea4dfe736278806bb846baf97838fc1c8412b0320b8b22d5a2946fe1fb23fae244e297b924baafeb7a4983dab7e292 SHA512 3f88272d42f30112733e5e7473aec9dc31458386b34192ee34465b7045f63b0e8d496cddfc7efb2156cd8a9a84efd68437c1b194be13595cbe6e3736dcc187c9
 DIST chromium-100-patchset-ppc64le-1.tar.xz 46796 BLAKE2B 6fb35077abe7d2b0776be916be2123c3153c72993189e2d7230f248003a3cfdb518a178a3ee9add3fee2cbdaf09709cbe7b60aeead9fb6c6b97d67e2c84f212e SHA512 a009131baa937b190fbac59d45f71c87cab390cdc11302337055613a1f077a7a9bb2083686205efbcb8f3c686742bd2d2371c94f0352269f05a86c56d2026704
+DIST chromium-100.0.4896.127.tar.xz 1358426108 BLAKE2B 6a87cbc23dc55d97d948dddd092d2e9a0ce4739b68be8218ef3a4fe24dafbbe99af3e0e53a1faa64db67b8b001b8e13046afc41b8489d67e7a5350ae97ff2677 SHA512 2d5336470fead874aa1ca599cd7dbad21bd2a73c0b2136badd7a865799a96bf52938aca88c643c8b7e93ec6ceb897b7c4f71ae92b4210cdce0af828d17ea081b
 DIST chromium-100.0.4896.75.tar.xz 1358118152 BLAKE2B a7747bd1a3ea4e2cab313c139ed68726a253c5b5c71c7b9817aeac94eb9ba167bc28a7c6d498e719c62b4054583c56aa2f2c45ce4351ee3437995393919712ef SHA512 df066ee1a9f8ae324c6ab0d788e01e5d30a9d30148c45f88b270dc00246d34d74a760e7ae6eb8490c4d688ad2d7b8f00d604bb0a260dd3fb7bfc80d3a987958e
 DIST chromium-100.0.4896.88.tar.xz 1358219840 BLAKE2B c26ff1c3e226b01f9f7f39f5b51d864d4a068358daddfe86ac5b8fb59b8e4399e4079409caaa1100d3918051f023bfb4ec09070e62ddde6dc3a79009bded5f95 SHA512 875ca6ad8062afe12e69f38767ad021dbda3342ea0a30a92ae4c90bf337984307bc7c3ae9ebc339b9d4daa39c00647ea94f43d7d6783f519a084ae6bb5c50e38
 DIST chromium-101-patchset-4.tar.xz 3644 BLAKE2B 537be42d078338afc46fb8f358afecffdeea11ffc76d391a2c8785cee343bcde5de4d3c2a4102e2cd90a7331bf561c54b7e0c390e21785db3821d3cd39fcb080 SHA512 19370a96f1f3edcf4d529038dedfdc1bc680e6265832bf5b3d0a86f6dbc6784d34dd861ad39c328d4755e21966d19614cbd2f7719af2981abe2c7d8e0e985a78
diff --git a/www-client/chromium/chromium-100.0.4896.127.ebuild b/www-client/chromium/chromium-100.0.4896.127.ebuild
new file mode 100644
index 000000000000..b279383dc0ec
--- /dev/null
+++ b/www-client/chromium/chromium-100.0.4896.127.ebuild
@@ -0,0 +1,1028 @@
+# Copyright 2009-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="4"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+PATCHSET_PPC64="1"
+PATCHSET_NAME_PPC64="chromium-$(ver_cut 1)-patchset-ppc64le-${PATCHSET_PPC64}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	ppc64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/${PATCHSET_NAME_PPC64}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid !libcxx )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+	virtual/opengl
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng] )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	x11-libs/libdrm:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-sound/pulseaudio:= )
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=x11-libs/libva-2.7:=[X] )
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libxcb:=
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		cups? ( >=net-print/cups-1.3.11:= )
+		sys-apps/pciutils:=
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/pango:=
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X,wayland?]
+			gui-libs/gtk:4[X,wayland?]
+		)
+	)
+	x11-misc/xdg-utils
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X,wayland?] )
+	)
+"
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	libcxx? ( >=sys-devel/clang-12 )
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang || use libcxx; then
+			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
+			CPP+=" -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="4G"
+	CHECKREQS_DISK_BUILD="9G"
+	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="12G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
+		done
+	fi
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-97-arm-tflite-cast.patch"
+		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-98-gtk4-build.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+		"${FILESDIR}/chromium-cross-compile.patch"
+	)
+
+	use ppc64 && PATCHES+=( "${WORKDIR}/patches-ppc64" )
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/dawn/third_party/tint
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+	if use libcxx; then
+		keeplibs+=( third_party/re2 )
+	fi
+	if use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng/utils )
+	else
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if { [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx; } && ! tc-is-clang; then
+		# Force clang since gcc is either broken or build is using libcxx.
+		if tc-is-cross-compiler; then
+			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_CC=${CBUILD}-clang
+			BUILD_CXX=${CBUILD}-clang++
+		else
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+		fi
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang || use libcxx; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+		# setup cups-config, build system only uses --libs option
+		if use cups; then
+			mkdir "${T}/cups-config" || die
+			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+			export PATH="${PATH}:${T}/cups-config"
+		fi
+
+		# Don't inherit PKG_CONFIG_PATH from environment
+		local -x PKG_CONFIG_PATH=
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	# re2 library interface relies on std::string and std::vector
+	if ! use libcxx; then
+		gn_system_libraries+=( re2 )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false"
+	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Disable unknown warning message from clang.
+	if tc-is-clang; then
+		append-flags -Wno-unknown-warning-option
+		if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+		fi
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_xkbcommon=false use_gtk=false"
+			myconf_gn+=" use_glib=false use_gio=false"
+			myconf_gn+=" use_pangocairo=false use_alsa=false"
+			myconf_gn+=" use_libpci=false use_udev=false"
+			myconf_gn+=" enable_print_preview=false"
+			myconf_gn+=" enable_remoting=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	else
+		myconf_gn+=" ozone_platform=\"x11\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+	fi
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 4f35bfc5bcad..0ec7fbe5fe10 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_100.0.4896.88-1_amd64.deb 87072160 BLAKE2B df2fae89b45efd3b54cbacb67fd89563bfb7d823ca0f72709d016274c16f39f5d661688d31c90b6375dd14f4ea2680652b803814011a9c648d2cd69d1794a959 SHA512 91a0b3f3229d3d46f7d9a8597fa66824246fcc8b454ed770c4eaa182c4ed63a7908721dfc3c05520eabdd7ff9c444dea58e7fda5bd369ee15faddabc896d60ce
+DIST google-chrome-stable_100.0.4896.127-1_amd64.deb 87064480 BLAKE2B 1149c669b3a6a24791088ae029a29e063c4971650119a748e5b4ecf3a093f0b91eb3828222f9ca7b31d24882c70cddfa3ca83aba6ec7efbbcf92a57fc3df88cd SHA512 a8fce1550dcfb3b4ac3b1d8aa3f80ee507526e7401522b6fcf9aec515b1059b2231b0ed8116649da628403898d5bde73fb542c65eed81f4cc01c8cd3e49aba2f
diff --git a/www-client/google-chrome/google-chrome-100.0.4896.88.ebuild b/www-client/google-chrome/google-chrome-100.0.4896.127.ebuild
similarity index 100%
rename from www-client/google-chrome/google-chrome-100.0.4896.88.ebuild
rename to www-client/google-chrome/google-chrome-100.0.4896.127.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 901ded04f611..6ac7968ba4a2 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,4 @@
 DIST opera-beta_86.0.4363.12_amd64.deb 84459428 BLAKE2B 3ae8e8ee977143df6dea0f42f2bb8ae840175306fb6db632406e227d3cb895c5f7b845495c95f449d0d6697976c2b50904b9cda1c7f4fa0eea95af95a320bde4 SHA512 49a6240e2a6ee3bcd1effbb5518859209e92864e800b25b247892579dd0891a9cb8f81b32fbce3c229d7529f429ee65c2a1d44cccbe702f2d2325e5a50fbb396
 DIST opera-beta_86.0.4363.15_amd64.deb 84377960 BLAKE2B c50bb3123bf54d38a33791f146c85f6cb5ff0422ac7401468fe3b52a278fb708bfe87f5829b4a44fa46dfcef89abc3cb4e96bf446f82618871c2260d06a0611a SHA512 49e82edbd8a0614566c53fad677753b315ef5b31adc333a34f0d16ce4d572ad6a63571c8b598a69ca24877b1e253ffe928b35cb981764dc09251706d062a55eb
-DIST opera-beta_86.0.4363.9_amd64.deb 84476288 BLAKE2B 7f7a33145264b86c9ada334f497a2f0ce7d3ad931d4653d1f3d66e863913c77150e16d578865da64708f424c41ce8a669dcae5a954dd2489e80e9c014bfa4d8a SHA512 e5bb6093a864e58f204b0fde5bc962b6b3cdab6da7efb081d497129abc9e0e6bf02684e220377a2248321ee5050aae665f25299881734313e7e038cec4b6c239
+DIST opera-beta_86.0.4363.17_amd64.deb 84367448 BLAKE2B 2aefc3bd35aa4baed532d33d74a84c97c4e31ddbb92df19231cd5e7dc2b93ae6fcc18c0b138c2270574c3b2ae5077cdf34d3759e652460690295e7c2815990a5 SHA512 caffd09646e30260d56fc865c3df1d2fa3cda1e219a077ac29c889187fb1aedeed2b75f530b6455a10fe5696e341057e8c30df307328abd8a08505c6bd1200db
 DIST opera-ffmpeg-codecs-100.0.4896.20.tar.xz 1393360 BLAKE2B be608a42042b2713fff66716c171959609e06d94b6c56cd8081e05313915378eff25c7098228ff6727a430c9f02bd4e9c9dcce4e715f09e10ac62d89ccd6ae1c SHA512 7dab4a091ac3562cd9c09cf37bc70edf9000ad1b3d31f27278e2edc68b9f55fd4f821ebc90a761ae5803542195718015c859e107344b31a5f7f9ad6cf028df42
diff --git a/www-client/opera-beta/opera-beta-86.0.4363.9.ebuild b/www-client/opera-beta/opera-beta-86.0.4363.17.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-86.0.4363.9.ebuild
rename to www-client/opera-beta/opera-beta-86.0.4363.17.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 2d4ec9281022..d7dd7e54ef3f 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 36448887ea31..4c1daf04da95 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_101.0.4951.34-1_amd64.deb 84465232 BLAKE2B 6f6f86dced5a9f85f42c767a5d83d514d61581f8b8d68cb4fc549c04e2605cee45783eafda22dbd53fa16bb04b650950f53948d90dcbb349fddb668797ef4860 SHA512 9d27d31a65746318d48038a723c1da965729bab113ac935184a2d6e6948db84e4a33d3cf0a930316326d31c4f95b2e07cb2c4b4202d8d9fc983b8ebcb19f3668
-DIST google-chrome-stable_100.0.4896.88-1_amd64.deb 87072160 BLAKE2B df2fae89b45efd3b54cbacb67fd89563bfb7d823ca0f72709d016274c16f39f5d661688d31c90b6375dd14f4ea2680652b803814011a9c648d2cd69d1794a959 SHA512 91a0b3f3229d3d46f7d9a8597fa66824246fcc8b454ed770c4eaa182c4ed63a7908721dfc3c05520eabdd7ff9c444dea58e7fda5bd369ee15faddabc896d60ce
+DIST google-chrome-stable_100.0.4896.127-1_amd64.deb 87064480 BLAKE2B 1149c669b3a6a24791088ae029a29e063c4971650119a748e5b4ecf3a093f0b91eb3828222f9ca7b31d24882c70cddfa3ca83aba6ec7efbbcf92a57fc3df88cd SHA512 a8fce1550dcfb3b4ac3b1d8aa3f80ee507526e7401522b6fcf9aec515b1059b2231b0ed8116649da628403898d5bde73fb542c65eed81f4cc01c8cd3e49aba2f
 DIST google-chrome-unstable_102.0.4997.0-1_amd64.deb 84892352 BLAKE2B 756ec3091e0dba5891bf75fdaafe4c16cff2a17f5a764be26401cc850d8f71f800c36ecb4672527034a5ec99712125643e7db74c594cf83853f4d56cb032b3b3 SHA512 d8ba6b2867164cfe7f6a4878333413c4ecc5cc30ffba6db5dcf49151ead9823657745c08ceb6521fa584f44f93a79bcf307f2dc045f62a703db220a60c2e1e47
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.88.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.127.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.88.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-100.0.4896.127.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 74f59f938df2..6b138d4a7f4d 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libfm-qt/libfm-qt-1.0.0.ebuild b/x11-libs/libfm-qt/libfm-qt-1.0.0.ebuild
index ae0026891912..dc94a44bcfe6 100644
--- a/x11-libs/libfm-qt/libfm-qt-1.0.0.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-1.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2bdb9d87868f..25a2208662f6 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -3,3 +3,4 @@ DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b83582
 DIST pango-1.50.4.tar.xz 4290504 BLAKE2B 310a7be79ebf693b3a7775fa86557539bf4ea682b0903266248ab2812504e805024b14a917531e71ad9b5637d4d3f3c1a06b84188eb01aeed37fdcc7d11679a9 SHA512 b44cf9bd7afd633fab326e70b69dcb9f00cc26dcc36361793d3654b5ae798a303d4e63e173370f396c4fa474a4118c53076927fe7cc944fc35a32adf3a656806
 DIST pango-1.50.5.tar.xz 4291708 BLAKE2B 90a1fc927ee1e06eb76ea6b82e9851e3381d5393a1992db0d3da4d3a934b5bf08f4485b40a9eef58aa906e3f0b74e71f491d947ae00310130ec5e23bde47d836 SHA512 6e898945ca9682ad113cea8a5702068d6141d39bc51a27093c6c1627c10825005155c73778cb5acab99551689dd1b47069f7d5ea102db11f00416ddcf747b8c6
 DIST pango-1.50.6.tar.xz 4293168 BLAKE2B 63cad33f5fe5361642edb0e26a11c45e28e23400f29c078079fa9ce4411eca90c67fdd789e8cf9caec0f1d4a6b5d619808d8dcf53447f961b66db17e1bbcdb97 SHA512 27fe5b2398995fc9103dbb957bb10e5f35284762260fe29366eafd2ba570d90bb0d2f865bd78ed6728417dfde54931f014aaa2155e3eae054e1a45a2a07bf90f
+DIST pango-1.50.7.tar.xz 4294752 BLAKE2B 049b7c09f2ec35ca229eadcd146513d2b292fac8c2296a1635f32c1e21a2ff14979c4ce4a88f966d2d85dad55e356f089c09e00062d06373f7d0760871333046 SHA512 4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3
diff --git a/x11-libs/pango/pango-1.50.7.ebuild b/x11-libs/pango/pango-1.50.7.ebuild
new file mode 100644
index 000000000000..13c9fd367584
--- /dev/null
+++ b/x11-libs/pango/pango-1.50.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="debug +introspection sysprof X"
+
+RDEPEND="
+	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DPANGO_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS
+	fi
+
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_native_use_feature introspection)
+		-Dinstall-tests=false
+		-Dfontconfig=enabled
+		$(meson_feature sysprof)
+		-Dlibthai=disabled
+		-Dcairo=enabled
+		$(meson_feature X xft)
+		-Dfreetype=enabled
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/gtk-doc/html
+	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
+	doins -r "${S}"/docs/Pango*
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if has_version 'media-libs/freetype[-harfbuzz]' ; then
+		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+		ewarn "lead to minor font rendering problems, see bug 712374."
+	fi
+}
diff --git a/x11-libs/qtermwidget/qtermwidget-1.0.0.ebuild b/x11-libs/qtermwidget/qtermwidget-1.0.0.ebuild
index f8774c1bbf33..3a1f67d2ec73 100644
--- a/x11-libs/qtermwidget/qtermwidget-1.0.0.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-1.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 6d123bf328a7..9a32b39e41e9 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/iconbox/iconbox-0.2.ebuild b/x11-misc/iconbox/iconbox-0.2.ebuild
index 5e38129b6e8d..3e0ccd702c27 100644
--- a/x11-misc/iconbox/iconbox-0.2.ebuild
+++ b/x11-misc/iconbox/iconbox-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 MY_P=${P/-/_}
 
 DESCRIPTION="App for placing icons in a menu which auto-hides"
-HOMEPAGE="https://packages.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild
index a12929e000c3..39a251ca8127 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/qps/qps-2.4.0-r1.ebuild b/x11-misc/qps/qps-2.4.0-r1.ebuild
index 4411efdedd08..7be26a9cfc33 100644
--- a/x11-misc/qps/qps-2.4.0-r1.ebuild
+++ b/x11-misc/qps/qps-2.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	>=dev-qt/linguist-tools-5.15:5
diff --git a/x11-misc/screengrab/screengrab-2.3.0.ebuild b/x11-misc/screengrab/screengrab-2.3.0.ebuild
index 067c0e8e7c11..14443e729754 100644
--- a/x11-misc/screengrab/screengrab-2.3.0.ebuild
+++ b/x11-misc/screengrab/screengrab-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE=""
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 03ae43b7b457..f2ae95d100c6 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/qterminal/qterminal-1.0.0.ebuild b/x11-terms/qterminal/qterminal-1.0.0.ebuild
index 52cf6360f85c..6618f19b5af3 100644
--- a/x11-terms/qterminal/qterminal-1.0.0.ebuild
+++ b/x11-terms/qterminal/qterminal-1.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index c78b00c28e36..f63370b10c7c 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/lxqt-themes/lxqt-themes-1.0.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-1.0.0.ebuild
index 2dd845ee2421..f4f37b2ef619 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-1.0.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-1.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"