diff --git a/Manifest.files.gz b/Manifest.files.gz
index c520206ebf2d..e56b1cebe31f 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 dc0900da4735..e44dc88e72a1 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-cmdb/Manifest b/app-admin/ansible-cmdb/Manifest
index 88f545e35d0d..e33a869b8ada 100644
--- a/app-admin/ansible-cmdb/Manifest
+++ b/app-admin/ansible-cmdb/Manifest
@@ -1,2 +1 @@
-DIST ansible-cmdb-1.28.tar.gz 177437 BLAKE2B d3faa6cccdaa0825318bc9df09ad28b15d1a70ac25281f283e65ed760698c06db582d6954f19efe6cdde8e7ab103a915e663659cc64d72851ed830c817a700b7 SHA512 d8f87b7e2c664aec20585c34a83271ea4ec397c70ff1114e2b3669ba17903ed8f57ddf774b74d3d267a423bb71bf6d9fd6e59aa497f4b17449104db6ac71b38a
 DIST ansible-cmdb-1.30.tar.gz 179165 BLAKE2B 377b182ffd0f7cf6630011f7df82fe1155c0f00a482e91e0d8206eee5aab167eb96dc936b2fbd02c6c80e725b9767f25a02422d538ee7ecf95ad1e9be51fe81a SHA512 e4561976588d6268c6849a4b1656c57d9a0f2db9256b2d2821f9c1a8c23fdb92b843b06bb94b44db565966c209b62da4bb11dfa41319a3b01ea4c7a53dde930f
diff --git a/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild b/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
deleted file mode 100644
index 997496d0fe9e..000000000000
--- a/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Ansible Configuration Management Database"
-HOMEPAGE="https://github.com/fboender/ansible-cmdb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/jsonxs[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/app-admin/ansible-cmdb/ansible-cmdb-1.30.ebuild b/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
similarity index 76%
rename from app-admin/ansible-cmdb/ansible-cmdb-1.30.ebuild
rename to app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
index c40d32a2b873..a87e1129b407 100644
--- a/app-admin/ansible-cmdb/ansible-cmdb-1.30.ebuild
+++ b/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
@@ -15,9 +15,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
 RDEPEND="
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/jsonxs[${PYTHON_USEDEP}]
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 49b25c69465c..12fab4c0e52f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,6 +1,7 @@
 DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e98e22bbcb58a87da174687af8ebdf693a94f04949119d544daaf6fb9bfe4388444d9ec8a24c0e8b67d202e75753 SHA512 dd943682d10212179ebba959b8919a07ba0b548c5f24f735c69c05f9e1c27efa3f74c45d9702b96c4e556a6b436947d34da88291fc5718386891a3425a738c84
 DIST awscli-1.21.12.tar.gz 2097963 BLAKE2B e752cb1369be9ee26b517ba1226d3e16fad0a075c7f82eb1fcce3a3076aa67c5dcf4bdefcc6c29166ac7a96a2aa59da24636ddf1d3eb9bd21f3f05e665581de3 SHA512 90f39476b86ce97c0b47910b2d5cf5c512f142c1bf1620d0fa2384bfb40e54f812269e7f1ff72951ee13f37e6c918061c2d592b4e96e46116032810e1eb6bcb1
 DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
+DIST awscli-1.22.10.tar.gz 2115079 BLAKE2B 72945d915fb932ff2d243eeca8c21976ecbf2f3e8de8e39765f0fb6885d1a715f7cdc32d695cfa89698c0850f6f32f8f28f8bab32b44ffaea13c944803a32607 SHA512 86af3d002802d4e6a7f4b1f046cb5d665a7715b03c0ed35277ed349a9eb80421aa77848b958f9c4fcb55af8113b1b2e1909d70746aed54e03655e136c1824e49
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
 DIST awscli-1.22.6.tar.gz 2112080 BLAKE2B 5fffb3d5d0cbbcea813114bbfc89df64f58e83135c88ab914ac4327185310075e7e19e34a51e6cf85f9d2e804fb75cc69e2f7967ea69c67ff1987e054b5756c1 SHA512 3bf7cf59f947708c0d8e6ec992498d0e58a1a2ccb6a330bced0e2eece9989ef9097e08034354a6c265da08346e37611862f3dbb96d35d9787d3013f6220b7de2
 DIST awscli-1.22.7.tar.gz 2112524 BLAKE2B f3aeaa85d8be945ee2c64e45b1cd74eaa89cd035c4650f2a35144c113c8b073a7856e680fd1c67ee54f382ab4ad593cbe4752b53b2637b3c587ecdfa22b6819e SHA512 07c96caddb099e507b0e9b75dac79249a8b26a1ca43a3be842079dfe8af399647dec5c330e6b75059955c132b0c5e179cac2edb2b814c51b47a7777d7f7d5373
diff --git a/app-admin/awscli/awscli-1.22.10.ebuild b/app-admin/awscli/awscli-1.22.10.ebuild
new file mode 100644
index 000000000000..d4b09dbaa2ec
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+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"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install 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
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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/clustershell/clustershell-1.8.3.ebuild b/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
similarity index 85%
rename from app-admin/clustershell/clustershell-1.8.3.ebuild
rename to app-admin/clustershell/clustershell-1.8.3-r1.ebuild
index 113e9a21ba5e..53371ad3d6a7 100644
--- a/app-admin/clustershell/clustershell-1.8.3.ebuild
+++ b/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: test phase
+EAPI=8
 
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
@@ -19,15 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
+BDEPEND="
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 RDEPEND="
-	${CDEPEND}
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-libs/openssl:0="
+
 RESTRICT="test" # currently fail
 
 python_install() {
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
index ce3a15b5e160..7c08e6373b07 100644
--- a/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
+++ b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-04-26 23:00:43.445135823 +0300
-+++ configure.in	2009-04-26 23:25:04.042489243 +0300
+--- a/configure.in
++++ b/configure.in
 @@ -389,8 +389,7 @@
  
  AC_MSG_CHECKING(abstract socket namespace)
diff --git a/app-admin/lib_users/lib_users-0.15.ebuild b/app-admin/lib_users/lib_users-0.15.ebuild
index 8d8364406cf6..b0b32070f375 100644
--- a/app-admin/lib_users/lib_users-0.15.ebuild
+++ b/app-admin/lib_users/lib_users-0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index a075a373341d..1a2b241f4ab0 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/tsm/tsm-8.1.6.0-r2.ebuild b/app-backup/tsm/tsm-8.1.6.0-r2.ebuild
index c8bfb5d1b7e5..d26ac9529906 100644
--- a/app-backup/tsm/tsm-8.1.6.0-r2.ebuild
+++ b/app-backup/tsm/tsm-8.1.6.0-r2.ebuild
@@ -61,8 +61,8 @@ RDEPEND="
 	acl? ( sys-apps/acl )
 	java? ( >=virtual/jre-1.7 )
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)"
 
 S="${WORKDIR}/bacli"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index d56bfb6c5c72..47411aea4d81 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 6af55096fdcb..a9bb845be5d5 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.13.06.tar.gz 1014981 BLAKE2B a93ff571919707568cd0162479e47c6241b4081713cfa88b30594227d01f9af2a6e3ad759ba62f5f5485322d68768ba1ea19087d07281fa1c2b949bcac99f70e SHA512 7aefc794edaa5799f96dd4afe099b747d532e4367bd372b9ed29db03f8276322113509fdd4885500864d292beeb9f407dc3f2ef2a04f92b65f240ee73eb174bb
+DIST stress-ng-0.13.07.tar.gz 1020232 BLAKE2B 54d2e01877420f0a9b03f1d2ffc3665b3d06def29f5d1370ca312a0c3a1453cebd5254e00aa0c0bbda1146785c26047d459e1e844bf3d47348f92529e93c029d SHA512 ec8f483c34c35ee9171f65e24614a3d4855d90cdfdc6c2d075ff86a2919e1c774ee5da0601e9e30d1c1f7fa7b146bf877de13e3deb88c892b703eb1b4c41e960
diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.06-r1.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild
similarity index 97%
rename from app-benchmarks/stress-ng/stress-ng-0.13.06-r1.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild
index 108507d2ca81..9dc84c767ecd 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.13.06-r1.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild
@@ -44,10 +44,11 @@ pkg_pretend() {
 src_compile() {
 	tc-export CC
 
+	export MAN_COMPRESS="0"
+
 	local myemakeopts=(
 		HAVE_APPARMOR="$(usex apparmor 1 0)"
 		HAVE_LIB_SCTP="$(usex sctp 1 0)"
-		MAN_COMPRESS="0"
 		VERBOSE="1"
 	)
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ac594f7cbf10..648256da027d 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
index 58947385f2c6..200110f06d13 100644
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0/0.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
deleted file mode 100644
index b90c56b31204..000000000000
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-server/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0/0.1"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	dev-libs/hidapi[${MULTILIB_USEDEP}]
-	dev-libs/json-c:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch"
-	"${FILESDIR}/${PN}-1.1.0-jsonc014.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	touch man/u2f-server.1 || die # do not rebuild the man page
-}
-
-multilib_src_configure() {
-	myeconfargs=(
-		--disable-h2a # tarball already contains the manpage
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2626a33f7429..de5ec0ab94ca 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/crossover-bin/crossover-bin-20.0.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-20.0.4-r1.ebuild
index 5cf94832ad2c..3f9645ab5dd3 100644
--- a/app-emulation/crossover-bin/crossover-bin-20.0.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-20.0.4-r1.ebuild
@@ -117,8 +117,8 @@ RDEPEND="${DEPEND}
 	x11-libs/pango[introspection]
 	x11-libs/vte:2.91[introspection]
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)
 "
 
diff --git a/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild
index b6892fa15c0b..ef3e996fa335 100644
--- a/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild
@@ -118,8 +118,8 @@ RDEPEND="${DEPEND}
 	x11-libs/pango[introspection]
 	x11-libs/vte:2.91[introspection]
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)
 "
 
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.26.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.26.ebuild
index 8bee34a33844..ec2ffc2cc226 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.26.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.26.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://fs-uae.net/"
 SRC_URI="https://github.com/FrodeSolheim/fs-uae-launcher/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="lha"
 RESTRICT="test" # The test files are just boilerplate.
 
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 5b3d2303c84a..92119effde7c 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/collectd/collectd-5.12.0-r2.ebuild b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
new file mode 100644
index 000000000000..c3aaedc933aa
--- /dev/null
+++ b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info lua-single \
+	multilib perl-functions python-single-r1 systemd tmpfiles udev
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors:  Requires libIOKit
+# amqp1:          Requires libqpid-proton
+# aquaero:        Requires aerotools-ng/libaquaero5
+# barometer:      Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkevents:     Requires dpdk
+# dpdkstat:       Requires dpdk
+# dpdk_telemetry: Requires dpdk
+# grpc:           Requires libgrpc
+# intel_pmu:      Requires libjevents (pmu-tools)
+# intel_rdt:      Requires libpqos from intel-cmt-cat project
+# lpar:           Requires libperfstat (AIX only)
+# mic:            Requires Intel Many Integrated Core Architecture API
+#                 (part of Intel's  Xeon Phi software)
+# netapp:         Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# onewire:        Requires sys-fs/owfs which was removed from repository
+# pf:             Requires BSD packet filter
+# pinba:          Requires MySQL Pinba engine (http://pinba.org/)
+# redfish:        Requires libredfish
+# tape:           Requires libkstat (Solaris only)
+# tokyotyrant:    Requires tokyotyrant
+# write_riemann:  Requires riemann-c-client
+# xmms:           Requires libxmms (v1)
+# zone:           Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer
+	dpdkevents dpdkstat dpdk_telemetry grpc intel_pmu intel_rdt lpar
+	mic netapp onewire pf pinba redfish tape tokyotyrant write_riemann
+	xmms zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+	buddyinfo capabilities ceph cgroups check_uptime chrony connectivity
+	conntrack contextswitch cpu cpufreq cpusleep csv curl curl_json
+	curl_xml dbi df disk dns drbd email entropy ethstat exec fhcount
+	filecount fscache gmond gps gpu_nvidia hddtemp hugepages interface ipc
+	ipmi iptables ipvs irq java lua load logfile logparser log_logstash
+	madwifi match_empty_counter match_hashed match_regex match_timediff
+	match_value mbmon mcelog md memcachec memcached memory modbus mqtt
+	multimeter mysql netlink network network nfs nginx notify_desktop
+	notify_email notify_nagios ntpd numa nut olsrd onewire openldap
+	openvpn oracle ovs_events ovs_stats pcie_errors perl ping postgresql
+	powerdns procevent processes protocols python redis routeros
+	rrdcached rrdtool sensors serial sigrok slurm smart snmp snmp_agent
+	statsd swap synproxy sysevent syslog table tail tail_csv
+	target_notification target_replace target_scale target_set tcpconns
+	teamspeak2 ted thermal threshold turbostat ubi unixsock uptime users
+	uuid varnish virt vmem vserver wireless write_graphite write_http
+	write_influxdb_udp write_kafka write_log write_mongodb write_prometheus
+	write_redis write_sensu write_stackdriver write_syslog write_tsdb
+	xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	acct-group/collectd
+	acct-user/collectd
+	dev-libs/libgcrypt:=
+	dev-libs/libltdl:0=
+	sys-libs/libcap
+	perl?					( dev-lang/perl:=[ithreads] )
+	udev?					( virtual/udev )
+	xfs?					( sys-fs/xfsprogs )
+	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
+	collectd_plugins_apache?		( net-misc/curl:0= )
+	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_ceph?			( dev-libs/yajl:= )
+	collectd_plugins_capabilities?		( dev-libs/jansson net-libs/libmicrohttpd:= )
+	collectd_plugins_connectivity?		( dev-libs/yajl:= net-libs/libmnl )
+	collectd_plugins_curl?			( net-misc/curl:0= )
+	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_dbi?			( dev-db/libdbi )
+	collectd_plugins_dns?			( net-libs/libpcap )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
+	collectd_plugins_gpu_nvidia?		( dev-util/nvidia-cuda-toolkit )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
+	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
+	collectd_plugins_lua?			( ${LUA_DEPS} )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached )
+	collectd_plugins_modbus?		( dev-libs/libmodbus )
+	collectd_plugins_mqtt?			( app-misc/mosquitto )
+	collectd_plugins_mysql?			( dev-db/mysql-connector-c:= )
+	collectd_plugins_netlink?		( net-libs/libmnl )
+	collectd_plugins_nginx?			( net-misc/curl:0= )
+	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
+	collectd_plugins_notify_email?		( net-libs/libesmtp:= )
+	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
+	collectd_plugins_openldap?		( net-nds/openldap )
+	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
+	collectd_plugins_ovs_events?		( dev-libs/yajl:= )
+	collectd_plugins_ovs_stats?		( dev-libs/yajl:= )
+	collectd_plugins_perl?			( dev-lang/perl:=[ithreads] )
+	collectd_plugins_ping?			( net-libs/liboping )
+	collectd_plugins_postgresql?		( dev-db/postgresql:= )
+	collectd_plugins_procevent?		( dev-libs/yajl:= )
+	collectd_plugins_python?		( ${PYTHON_DEPS} )
+	collectd_plugins_redis?			( dev-libs/hiredis:= )
+	collectd_plugins_routeros?		( net-libs/librouteros )
+	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
+	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
+	collectd_plugins_sensors?		( sys-apps/lm-sensors:= )
+	collectd_plugins_sigrok?		( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
+	collectd_plugins_slurm?			( sys-cluster/slurm )
+	collectd_plugins_smart?			( dev-libs/libatasmart:0= )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_snmp_agent?		( net-analyzer/net-snmp )
+	collectd_plugins_sysevent?		( dev-libs/yajl:= )
+	collectd_plugins_varnish?		( www-servers/varnish:= )
+	collectd_plugins_virt?			( app-emulation/libvirt:= dev-libs/libxml2:2= )
+	collectd_plugins_write_http?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_write_kafka?		( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
+	collectd_plugins_write_mongodb?		( >=dev-libs/mongo-c-driver-1.8.2:= )
+	collectd_plugins_write_prometheus?	( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
+	collectd_plugins_write_redis?		( dev-libs/hiredis:= )
+	collectd_plugins_write_stackdriver?	( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_xencpu?		( app-emulation/xen-tools:= )
+
+	kernel_FreeBSD? (
+		collectd_plugins_disk?		( sys-libs/libstatgrab:= )
+		collectd_plugins_interface?	( sys-libs/libstatgrab:= )
+		collectd_plugins_load?		( sys-libs/libstatgrab:= )
+		collectd_plugins_memory?	( sys-libs/libstatgrab:= )
+		collectd_plugins_swap?		( sys-libs/libstatgrab:= )
+		collectd_plugins_users?		( sys-libs/libstatgrab:= )
+	)"
+
+# FIXME: should virtual/jdk be here as well?
+BDEPEND="virtual/pkgconfig"
+
+# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
+DEPEND="${COMMON_DEPEND}
+	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
+	collectd_plugins_java?			( >=virtual/jdk-1.8 )"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.8 )
+	collectd_plugins_syslog?		( virtual/logger )
+	selinux?				( sec-policy/selinux-collectd )"
+
+REQUIRED_USE="
+	collectd_plugins_lua?			( ${LUA_REQUIRED_USE} )
+	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
+	collectd_plugins_smart?			( udev )
+	contrib?				( perl )"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch )
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then
+					return 0;
+				fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	if ! linux_chkconfig_present PROC_FS; then
+		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+	fi
+
+	if ! linux_chkconfig_present SYSFS; then
+		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+	fi
+
+	# battery.c: /proc/pmu/battery_%i
+	# battery.c: /proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cgroups.c: /sys/fs/cgroup/
+	collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# drbd.c: /proc/drbd
+	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+	# conntrack.c: /proc/sys/net/netfilter/*
+	collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+	# fscache.c: /proc/fs/fscache/stats
+	collectd_plugin_kernel_linux fscache FSCACHE warn
+
+	# nfs.c: /proc/net/rpc/nfs
+	# nfs.c: /proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c: /proc/tty/driver/serial
+	# serial.c: /proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c: /proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c: /proc/acpi/thermal_zone
+	# thermal.c: /sys/class/thermal
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# turbostat.c: /dev/cpu/%d/msr
+	collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+	# vmem.c: /proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# vserver.c: /proc/virtual
+	collectd_plugin_kernel_linux vserver VSERVER warn
+
+	# uuid.c: /sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c: /proc/net/wireless
+	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	if use collectd_plugins_java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	use collectd_plugins_lua && lua-single_pkg_setup
+	use collectd_plugins_python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	# Adjust upstream's systemd unit
+	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
+	#   - Add User=collectd to run collectd as user "collectd" per default
+	sed -i \
+		-e '/^EnvironmentFile=.*/d' \
+		-e '/^\[Service\]/aUser=collectd' \
+		contrib/systemd.${PN}.service || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="barometer battery cpu cpufreq disk
+		drbd entropy ethstat hugepages interface iptables
+		ipvs irq ipc load memory md netlink nfs numa processes
+		serial swap tcpconns thermal turbostat users vmem wireless
+		zfc_arc"
+
+	local need_libstatgrab=0
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	local myconf="--disable-werror"
+
+	# Do we debug?
+	myconf+=" $(use_enable debug)"
+
+	# udev support?
+	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+	if use udev; then
+		myconf+=" --with-libudev"
+	else
+		myconf+=" --without-libudev"
+	fi
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		if [[ "${plugin}" == 'dpdkstat' ]]; then
+			myconf+=" --without-libdpdk"
+		else
+			myconf+=" --disable-${plugin}"
+		fi
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+				# ... must we link against libstatgrab? Bug #541518
+				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+					need_libstatgrab=1
+				fi
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	if [ "${need_libstatgrab}" -eq 1 ]; then
+		myconf+=" --with-libstatgrab"
+	else
+		myconf+=" --without-libstatgrab"
+	fi
+
+	# JAVA_HOME is set by eclasses.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
+	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
+	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
+
+	if use collectd_plugins_gpu_nvidia; then
+		myconf+=" --with-cuda=${EPREFIX}/opt/cuda"
+	else
+		myconf+=" --with-cuda=no"
+	fi
+
+	if use perl; then
+		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+	else
+		myconf+=" --without-perl-bindings"
+	fi
+
+	# No need for v5upgrade
+	myconf+=" --disable-target_v5upgrade"
+
+	# Python
+	if use collectd_plugins_python; then
+		myconf+=" --with-libpython=yes"
+		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+	else
+		myconf+=" --with-libpython=no"
+	fi
+
+	# XFS support
+	myconf+=" $(use_enable xfs)"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+		$(use_enable static-libs static) \
+		--localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	perl_delete_localpod
+
+	find "${ED}"/usr/ -name "*.la" -delete || die
+
+	if use collectd_plugins_java; then
+		java-pkg_regjar "${ED}"/usr/share/${PN}/java/*.jar
+	fi
+
+	if use collectd_plugins_disk && use udev; then
+		udev_newrules contrib/99-storage-collectd.rules 60-persistent-storage-collectd.rules
+	fi
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	einstalldocs
+
+	if use contrib; then
+		insinto /usr/share/${PN}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"/etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"/etc/collectd.conf || die
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	if use filecaps; then
+		local caps=()
+		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
+		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
+		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
+		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
+
+		if use collectd_plugins_dns || use collectd_plugins_ping; then
+			caps+=('CAP_NET_RAW')
+		fi
+
+		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
+			caps+=('CAP_SYS_RAWIO')
+		fi
+
+		if [ ${#caps[@]} -gt 0 ]; then
+			local caps_str=$(IFS=","; echo "${caps[*]}")
+			fcaps ${caps_str} usr/sbin/collectd
+			elog "Capabilities for ${EROOT}/usr/sbin/collectd set to:"
+			elog "  ${caps_str}+EP"
+			elog
+
+			local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
+			if [[ -e "${systemd_unit}" ]]; then
+				caps_str="${caps[*]}"
+				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
+					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
+
+				elog "CapabilityBoundingSet in '${systemd_unit}'"
+				elog "updated to match capabilities set above."
+				elog
+			else
+				if has_version "sys-apps/systemd"; then
+					# Bug 596852
+					ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
+					ewarn "because unit was not found. Please file a bug about this."
+				fi
+			fi
+		fi
+	fi
+
+	elog "Note: Collectd is only the collector."
+	elog "      You need to install 'data' sources (applications) locally or"
+	elog "      remotely on your own."
+
+	elog
+	elog "Collectd is configured to run as unprivileged user by default."
+	elog "You may want to revisit the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+
+	if use collectd_plugins_smart; then
+		elog ""
+		elog "If you are using smart plugin and don't run collectd as root make sure"
+		elog "that the collectd user is allowed to access the disk you want to monitor"
+		elog "(can be done via udev rule for example) and that collectd has the required"
+		elog "capabilities set (which is the default when package was emerged with"
+		elog "'filecaps' USE flag set)."
+	fi
+
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/CGI, dev-perl/Config-General and net-analyzer/rrdtool[perl] to be installed."
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 640d17a7996c..9d17ad933684 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/filebus/Manifest b/app-misc/filebus/Manifest
index 90771dc8bffe..011bfeeee6f8 100644
--- a/app-misc/filebus/Manifest
+++ b/app-misc/filebus/Manifest
@@ -1,2 +1,3 @@
 DIST filebus-0.3.2.tar.gz 17310 BLAKE2B 0f30aabcd316f52ea12d12b136befe643085dff5e283f65edf2a459b127cd3e2d48c472ae0dd8f302bb7211e4da5541a6fc7ac274573631ab03fc246bc8b566f SHA512 88ce3cd2d8aec7afd30d16315a6a8a37dee1b21d882571ef87c7dca56251e737d6500a5fad0124c62aea6383aae5ec30abd8abf86c2fac5d582f8fe96049eaa6
 DIST filebus-0.3.4.tar.gz 17404 BLAKE2B cf6a3fef2e7f3d69fb73df3f9134666e5d1d09d02cc94cd73c2818b1fc92132fafeb8b3b6f904316ab57a3aab4fa01ba00e0e5bfabf9a9c5194de3d6a8666417 SHA512 0619eda926ca77730558600d29a1b7811972b411b86d6c5374f1ccbcd0a4901f70eb87df7577690d72bb7eec4a4191f3b7b4bca237317352bdc0f0ce0f36f120
+DIST filebus-0.3.5.tar.gz 17373 BLAKE2B bd49f86e658bcc8dcdcc7cc0c5ca1a3c354a716137157753417b9b57294c14f058292650092e7e8bdb5563e041c009f36474508fb121e14487075cfc41b223bb SHA512 639b047be8fd3eba9cf97e57d7234f590aeb28e6e321195b435480ce0b334e14c236b888e79d14a824b16505e1c2d2c1fc04dd5d75b6f7ac1c8e9fbae6bf562f
diff --git a/app-misc/filebus/filebus-0.3.5.ebuild b/app-misc/filebus/filebus-0.3.5.ebuild
new file mode 100644
index 000000000000..aa9148dd2099
--- /dev/null
+++ b/app-misc/filebus/filebus-0.3.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A user space multicast named pipe implementation backed by a regular file"
+HOMEPAGE="https://github.com/pipebus/filebus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="+inotify python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		inotify? ( dev-python/watchdog[${PYTHON_USEDEP}] )
+	)"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	if use python; then
+		distutils-r1_src_prepare
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	"${BASH}" ./lib/bash/filebus-test.bash test || die
+
+	if use python; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	python test/test_filebus.py || die "tests failed for ${EPYTHON}"
+}
+
+src_install() {
+	if use python; then
+		distutils-r1_src_install
+	else
+		insinto /usr/libexec/filebus
+		doins lib/bash/*.bash
+		cat <<-EOF > "${T}/filebus"
+		#!/bin/sh
+		exec bash "${EPREFIX}/usr/libexec/filebus/filebus.bash" "\$@"
+		EOF
+		dobin "${T}/filebus"
+		dosym filebus /usr/bin/pipebus
+	fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9fa7d336a16f..bc440c7eb465 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index f6800339eee2..d5eca9eb40ab 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,2 +1 @@
-DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
 DIST cmark-0.30.2.tar.gz 246033 BLAKE2B 487f5adf47afdd4133e16b6cca1403cd555f8722b47c423960909de73aacac1d0f8b16311f6d5349addb5f03a86562545bb2ec80771b822bb8e5b82816375124 SHA512 aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
deleted file mode 100644
index a1db9210003d..000000000000
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="CommonMark parsing and rendering library and program in C"
-HOMEPAGE="https://github.com/commonmark/cmark"
-SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/0.29.0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python38_tests.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMARK_LIB_FUZZER=OFF
-		-DCMARK_SHARED=ON
-		-DCMARK_STATIC=OFF
-		-DCMARK_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/app-text/cmark/cmark-0.30.2.ebuild b/app-text/cmark/cmark-0.30.2.ebuild
index a1048b70329a..97d0f495a45e 100644
--- a/app-text/cmark/cmark-0.30.2.ebuild
+++ b/app-text/cmark/cmark-0.30.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/cmark/files/cmark-0.29.0-python38_tests.patch b/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
deleted file mode 100644
index 13cd71815941..000000000000
--- a/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 92697d564042d5b914048e087e4274c3c71e0055 Mon Sep 17 00:00:00 2001
-From: Christopher Fujino <christopherfujino@gmail.com>
-Date: Sun, 12 Jul 2020 16:11:42 -0700
-Subject: [PATCH] replace cgi.escape with html.escape (#656)
-
----
- test/normalize.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/normalize.py b/test/normalize.py
-index 6073bf01..f8ece18d 100644
---- a/test/normalize.py
-+++ b/test/normalize.py
-@@ -13,7 +13,7 @@ class HTMLParseError(Exception):
- from html.entities import name2codepoint
- import sys
- import re
--import cgi
-+import html
- 
- # Normalization code, adapted from
- # https://github.com/karlcow/markdown-testsuite/
-@@ -66,7 +66,7 @@ def handle_starttag(self, tag, attrs):
-                     self.output += ("=" + '"' +
-                             urllib.quote(urllib.unquote(v), safe='/') + '"')
-                 elif v != None:
--                    self.output += ("=" + '"' + cgi.escape(v,quote=True) + '"')
-+                    self.output += ("=" + '"' + html.escape(v,quote=True) + '"')
-         self.output += ">"
-         self.last_tag = tag
-         self.last = "starttag"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 0d87497ec61c..bd5f8bd8d903 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 3d0dc1992b4f..f83e6215016f 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,2 +1,4 @@
 DIST aws-2020-20200429-19A9F-src.tar.gz 4120886 BLAKE2B 44156b532dd4382995e5b33eedbb39b4d4fa542f57f3a7d596875a25c1eb59c3e4cc0085cfc60f385566842f2b047086a66a966dc3b9dcd8f48ae7da0c07c01e SHA512 284331bcd07955737ebc6b95a0a72984ace55a1911f1ed809b0ba8e525b03df57a668ccd92d0edfde42be2e06c09a3225e84f5d0501a488a004eb3eeaa746a61
 DIST aws-2021-20210518-19F65-src.tar.gz 4351625 BLAKE2B 227e1af5423c7cbf8b15b2ad37b5fbea862daca10dd12e79edb6cb1392f502b8b665d0cedc151a4190723c6aa795801b65c5807592d0292511a9a80318f0a722 SHA512 1820750daf2ba2e95479a8280aa0eae0d38e1d86a32570b4caaa845498ad8f0e8ac8c91f6aef0d5ef06fa1b33bc2b2b264cacb7101ca69fc81f36ab8cb17c65f
+DIST aws-22.0.0.tar.gz 2356886 BLAKE2B 3f0a36ce23ed50855dddeb8ecc1888d51c4c7368990124c3d55f240c8b07cc72b59b4c172cad05d282de0ff4cd348ff912315d8cfad1582b2bbb049ad5fcea12 SHA512 6baeff7fa8012cb155bd3964177368f4ccd0bb367abaa66d44c0ffbcd4145f3930fe2e0fe5cfbeb41adccb7395d46c49acffc502878e9b83ecb5e2de597b897b
+DIST templates-parser-22.0.0.tar.gz 224473 BLAKE2B c0c0d6feada3d0e54ee0456b48979e1f436c2bdf7210aeb061640c3128294b243ac21c29ef538b055871315b567640e37782b28057954bf4d43473d372c7d983 SHA512 9ce512e41bf3e682f1671d3ed931830d2279da9bef58f9997e430f4852cebb6119cabf0fde7dfaf999586155c13472ab258a0e0f3d885522aeb86d8acb4a2d4f
diff --git a/dev-ada/aws/aws-22.0.0.ebuild b/dev-ada/aws/aws-22.0.0.ebuild
new file mode 100644
index 000000000000..2ad9894c2821
--- /dev/null
+++ b/dev-ada/aws/aws-22.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz
+	https://github.com/AdaCore/templates-parser/archive/refs/tags/v${PV}.tar.gz
+	-> templates-parser-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared,static-libs]
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	rmdir templates_parser || die
+	mv ../templates-parser-${PV} templates_parser || die
+}
+
+src_configure() {
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		ZLIB=true SOCKET=openssl \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_compile() {
+	emake \
+		PROCESSORS=$(makeopts_jobs) ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PROCESSORS=$(makeopts_jobs) ENABLE_SHARED=true \
+		GPRINSTALL="/usr/bin/gprinstall -v"
+	einstalldocs
+}
diff --git a/dev-ada/aws/files/aws-22.0.0-gentoo.patch b/dev-ada/aws/files/aws-22.0.0-gentoo.patch
new file mode 100644
index 000000000000..868345504240
--- /dev/null
+++ b/dev-ada/aws/files/aws-22.0.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- a/Makefile	2021-11-18 21:58:13.144841987 +0100
++++ b/Makefile	2021-11-18 21:59:15.974876738 +0100
+@@ -185,10 +185,9 @@
+ #  build
+ 
+ build-tools-native:
+-	$(GPRBUILD) -p $(GPROPTS) $(GPR_STATIC) tools/tools.gpr
++	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) tools/tools.gpr
+ 
+ build-lib-native:
+-	$(GPRBUILD) -p $(GPROPTS) aws.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
+ endif
+@@ -259,15 +258,15 @@
+ 	--build-var=LIBRARY_TYPE --build-var=AWS_BUILD
+ 
+ install-lib-native:
+-	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_DEFAULT) \
+-		--build-name=$(DEFAULT_LIBRARY_TYPE) aws.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
+ 		$(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
++	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
++		$(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) ssl/ssl.gpr
+ endif
+ 
+ install-tools-native:
+-	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_STATIC) --mode=usage \
++	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_SHARED) --mode=usage \
+ 		--build-name=$(DEFAULT_LIBRARY_TYPE) \
+ 		--install-name=aws tools/tools.gpr
+ 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index a4cee4726fb7..093c3b7e3281 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 26567fc4ff3b..e15b5865297e 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -30,5 +30,5 @@ DIST mariadb-10.5.12-patches-01.tar.xz 5996 BLAKE2B 202804c0c41e8f646f1430f387e6
 DIST mariadb-10.5.12.tar.gz 101914615 BLAKE2B 98910fee3ae7c300ab1cee7b9373695f642b1ace88f8a3136da3a565a97810754633a7479d863e324b6b94969356df7bb92e7fbc6e9b90a1e8a77c4c1d52b659 SHA512 c732c2033304f273900b3dcf21936e28aebb147316fcabc7efdc43b75bc47c198daacfaaae082b997d4e695139d2aeaa2619bd29935f1b6f0aa25b9b9cde9ae5
 DIST mariadb-10.5.13-patches-01.tar.xz 5012 BLAKE2B 34a5af415737f71750a8fa47de4f2119e31723686f000a7f99f9892a0a12fbd2be3c7bb635197b131691d73ae663e34c1b010b154d62e1ea16535265f96200f1 SHA512 71e7940558fa863835ef86f04c48c4a1ca927dee0d9ae94fcb32facde857dfef1757ae96b5a738653c341fa19a67916b0b3a03ce473020edd5c8b52ccedc0bea
 DIST mariadb-10.5.13.tar.gz 102047279 BLAKE2B be91ebbd05b72d8046eaea73075510e160d7985b2766f64a1cdd3e5bbad1f4eebe9f371caf070a0e9fab605a90588539a4011ea4b2e4243ea4fd8f299ee836fd SHA512 5d5ac04a3c8099a982cacb98dd4c162966fc7957e11c28e8b5645e49ffcf0513b9c8956f43d215c37e5eaa34aa8db6c71cfe993c89d62cab123021ee83169e7f
-DIST mariadb-10.6.5-patches-01.tar.xz 5024 BLAKE2B 8ea84b84f48d41aa5e1c962620efcdd04ea5b2207dd8e64c9d35063f6a69719b8127f0ff32106e6781c84dc026ba8c3bf06acb96328db16af713e48652e8fb67 SHA512 e76a62315e899f7720cc9e31975ed6b179f53d6b23a8a76d44a24953d4f7420724b16e92a2bbba32b6ff4fde2c45ff8de393aad2f32450d860b1ce461796d965
+DIST mariadb-10.6.5-patches-02.tar.xz 5040 BLAKE2B 3004d2537acf0d8a2a916c48754af14435d013f202d3c2a126837eb9864fa13a832136687ce5c41ed479ee1b0a9b2b3177596e4635f6b8e62de6f82ddb07cc85 SHA512 f87613028065f8d67c4c46fbebaeecef0be3bb9f05f4c4961aeb6a8a8e8413ed1d691e0dae95d2f012d7d0ab25e268cb96968a885139c6b609cce2816c8eb224
 DIST mariadb-10.6.5.tar.gz 85061860 BLAKE2B 668fe327e6a46c66bc0b77339d71279cc8bfe468d1e634035e639e88aabaa09ea27aa50e3b9d27728a275e1e7861e8db1209d372d751084ea486ad31f6f1fd29 SHA512 5aafe0a8d5ae54a6f798a6fd0cf922521f5b8e54ef5fb5c7db1cf798a7755f5910bb0b8a6c371cb8253dfb48f4ebca0becd6eb543b68473d564d2092df3185a1
diff --git a/dev-db/mariadb/mariadb-10.6.5.ebuild b/dev-db/mariadb/mariadb-10.6.5.ebuild
index 714e06139d7f..9619a0b14778 100644
--- a/dev-db/mariadb/mariadb-10.6.5.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.5.ebuild
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \
 	multiprocessing java-pkg-opt-2 cmake
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.6.5-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.6.5-patches-02.tar.xz"
 
 SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
 	${PATCH_SET}"
@@ -31,7 +31,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild
index 69f1ac6bae71..b35555d20dbf 100644
--- a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild
+++ b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild
@@ -30,8 +30,8 @@ RDEPEND="dev-libs/libaio
 	sys-libs/zlib
 	sys-process/numactl
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)
 	!dev-db/percona-xtrabackup"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bef89aea68d7..066a6cbdd326 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/botan-2.18.2.ebuild b/dev-libs/botan/botan-2.18.2.ebuild
index 24a18b5602e6..2ef6665f0d77 100644
--- a/dev-libs/botan/botan-2.18.2.ebuild
+++ b/dev-libs/botan/botan-2.18.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 IUSE="bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib"
 
 CPU_USE=(
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index e429f5bf8727..85caab610101 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -2,3 +2,4 @@ DIST intel-compute-runtime-21.41.21220.tar.gz 4753783 BLAKE2B a340c2b5c1199498a6
 DIST intel-compute-runtime-21.42.21270.tar.gz 4761371 BLAKE2B 5dd2886e4b2a84a2247d2bb70667805531f099881431d9e8052c870d4081378cbbb43ea3f595c890f9d1930b9d054c0813da3f8b1c5509ad2090c78a4d683ed5 SHA512 f913bb116e84c0bd477578e75e10b67ef9c42bb447c2afdeefd9bb8ae291e53b019937d6e474e749a9bf98741366c8e76e5a8dcd23f8a9fac48e306e8dc9a648
 DIST intel-compute-runtime-21.43.21438.tar.gz 4840204 BLAKE2B 6de3075132b9a48e97e30e66c6e09dd24f51cabddf55622f2c7490d38bd1ad25e4853206a0a8a3c4c34ac3eb774e44974c47089182652ae2d234044b72d1d048 SHA512 e8f98d9c8c0a01794d57276706ec4212a3fb082c8ac04dc76ceb0e30fecbd8d35405baaa45685fd4b241e8b04a15db16aef75bf1929c81ff879af46e5be00d1e
 DIST intel-compute-runtime-21.44.21506.tar.gz 4851449 BLAKE2B beb49e8bbbfab098bb07943def326463b50f3a4b659368c5b24aadede582331c2c15d4d047e3bbae3d0ca32752c4a05861b0c0a325f30e91bc865276722116b6 SHA512 ae8ca2780602c53f13379ea798462fff1c136967186da21c5b714ed5ab405cb815e0e5e9e60cf8586cef151424270db624b473748d2756ee5768dba4cc020ea6
+DIST intel-compute-runtime-21.45.21574.tar.gz 4868091 BLAKE2B 48ff1ba42e5fe5eb231ec82bb7b33d0bb96460fc5adbfcb4702b68397d58b1b88f2a4e5a2dbef462731d43c284439cc4626ebf308d9dcfc509ccb68cea63eb19 SHA512 ede4ca4772ec6518592557d4c49d0a25204773607ae6737a35d20a3abb73ebbe66d01139baba544d5292d848a05a166a2c5ca1712408f85ce6be840bcf104650
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.45.21574.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.45.21574.ebuild
new file mode 100644
index 000000000000..aa334bc43b1f
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.45.21574.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8744
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.5.4 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/starpu/starpu-1.3.9.ebuild b/dev-libs/starpu/starpu-1.3.9.ebuild
index 33fa716eb10b..e2cae6707f73 100644
--- a/dev-libs/starpu/starpu-1.3.9.ebuild
+++ b/dev-libs/starpu/starpu-1.3.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 8e37316b1012..bee3942ec2cb 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luasec/luasec-1.0.2-r1.ebuild b/dev-lua/luasec/luasec-1.0.2-r1.ebuild
index e1b90c4370e9..7289a6808763 100644
--- a/dev-lua/luasec/luasec-1.0.2-r1.ebuild
+++ b/dev-lua/luasec/luasec-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
deleted file mode 100644
index 5b124acb9064..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_P="${PN}-${EGIT_COMMIT}"
-
-inherit flag-o-matic lua toolchain-funcs
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="
-	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-	https://github.com/diegonehab/luasocket
-"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-HTML_DOCS="doc/."
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-O2 -ggdb3//g' -i src/makefile || die
-
-	# Workaround for 32-bit systems
-	append-cflags -fno-stack-protector
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LDFLAGS_linux=-O -fpic -shared -o"
-		"LUAINC_linux=$(lua_get_include_dir)"
-		"LUAV=${ELUA}"
-		"MIME_V=1.0.3-${ELUA}"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-		"SOCKET_V=3.0-rc1-${ELUA}"
-	)
-
-	emake "${myemakeargs[@]}" all
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CDIR=$(lua_get_cmod_dir)"
-		"DESTDIR=${ED}"
-		"LDIR=$(lua_get_lmod_dir)"
-		"LUAPREFIX_linux="
-		"MIME_V=1.0.3-${ELUA}"
-		"SOCKET_V=3.0-rc1-${ELUA}"
-	)
-
-	emake "${myemakeargs[@]}" install
-	emake "${myemakeargs[@]}" install-unix
-
-	insinto "$(lua_get_include_dir)"/luasocket
-	doins src/*.h
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
index 015fe3566df1..58fe8d5c2285 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
 
diff --git a/dev-perl/MP3-Info/MP3-Info-1.260.0.ebuild b/dev-perl/MP3-Info/MP3-Info-1.260.0-r1.ebuild
similarity index 84%
rename from dev-perl/MP3-Info/MP3-Info-1.260.0.ebuild
rename to dev-perl/MP3-Info/MP3-Info-1.260.0-r1.ebuild
index 9399966ba753..bbf01e761def 100644
--- a/dev-perl/MP3-Info/MP3-Info-1.260.0.ebuild
+++ b/dev-perl/MP3-Info/MP3-Info-1.260.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=JMERELO
 DIST_VERSION=1.26
@@ -12,9 +12,3 @@ DESCRIPTION="A Perl module to manipulate/fetch info from MP3 files"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/MP3-Tag/MP3-Tag-1.150.0.ebuild b/dev-perl/MP3-Tag/MP3-Tag-1.150.0-r1.ebuild
similarity index 83%
rename from dev-perl/MP3-Tag/MP3-Tag-1.150.0.ebuild
rename to dev-perl/MP3-Tag/MP3-Tag-1.150.0-r1.ebuild
index e78285027ed3..dd600449edcd 100644
--- a/dev-perl/MP3-Tag/MP3-Tag-1.150.0.ebuild
+++ b/dev-perl/MP3-Tag/MP3-Tag-1.150.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=ILYAZ
 DIST_VERSION=1.15
@@ -15,9 +15,13 @@ DESCRIPTION="Module for reading tags of MP3 Audio files"
 SLOT="0"
 LICENSE="Artistic"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE=""
 
-RDEPEND="dev-perl/MP3-Info"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-perl/MP3-Info
+"
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
+
+# somewhat flaky
+DIST_TEST=do
diff --git a/dev-perl/MP4-Info/MP4-Info-1.130.0.ebuild b/dev-perl/MP4-Info/MP4-Info-1.130.0-r1.ebuild
similarity index 65%
rename from dev-perl/MP4-Info/MP4-Info-1.130.0.ebuild
rename to dev-perl/MP4-Info/MP4-Info-1.130.0-r1.ebuild
index 3ef05d9ec4cf..0244d8fa1665 100644
--- a/dev-perl/MP4-Info/MP4-Info-1.130.0.ebuild
+++ b/dev-perl/MP4-Info/MP4-Info-1.130.0-r1.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_VERSION=1.13
-MODULE_AUTHOR=JHAR
+DIST_VERSION=1.13
+DIST_AUTHOR=JHAR
 inherit perl-module
 
 DESCRIPTION="Fetch info from MPEG-4 files (.mp4, .m4a, .m4p, .3gp)"
-
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	virtual/perl-Encode
 	dev-perl/IO-String
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 "
-
-SRC_TEST=do
diff --git a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild b/dev-perl/MRO-Compat/MRO-Compat-0.130.0-r1.ebuild
similarity index 65%
rename from dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
rename to dev-perl/MRO-Compat/MRO-Compat-0.130.0-r1.ebuild
index 671f052a70fe..f9ec053ecde2 100644
--- a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
+++ b/dev-perl/MRO-Compat/MRO-Compat-0.130.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=HAARG
 DIST_VERSION=0.13
@@ -11,13 +11,3 @@ DESCRIPTION="Lets you build groups of accessors"
 
 SLOT="0"
 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-#	>=dev-perl/Class-C3-0.20
-#	>=dev-perl/Class-C3-XS-0.08
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.470.0 )"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 40cb1651058e..0cd5aeb9aaf0 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
similarity index 94%
rename from dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild
rename to dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
index c48da38cbd41..332e02dda4dd 100644
--- a/dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild
+++ b/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-module
 SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
@@ -11,9 +11,8 @@ DESCRIPTION="Mozilla's CA cert bundle in PEM format (Gentoo stub)"
 LICENSE="MPL-2.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=""
 
 RDEPEND="app-misc/ca-certificates"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
diff --git a/dev-perl/Mozilla-PublicSuffix/Manifest b/dev-perl/Mozilla-PublicSuffix/Manifest
index 8d8950744197..5d351f1a4542 100644
--- a/dev-perl/Mozilla-PublicSuffix/Manifest
+++ b/dev-perl/Mozilla-PublicSuffix/Manifest
@@ -1,2 +1,2 @@
-DIST Mozilla-PublicSuffix-v1.0.0.tar.gz 71669 BLAKE2B 5a5866b6446cf56df24d5113e2ce663dec3ace6025ff9888b40914b577215dcb65f3f57bae1ac31bc82ff5dc3a0ae4d79f1d63dbe6fa717358ebf92d0779b579 SHA512 79ed7256bccb33f1f428657bd60cccaf7be5d4793424337b94a812a41f46e90507b8c32b3aa8b381bf16d77f4a3f911301f757332e9144718efd2341996d9cc6
 DIST Mozilla-PublicSuffix-v1.0.4.tar.gz 85940 BLAKE2B a3f8266dc0c48b302cc5c9a488318f2b3668ffdb6e50bc567362d1e00b1798f7a37470e2b3f78321b48567f411d6e10e9b1ffd88bd82caa0659ce2b7f67c43e5 SHA512 681803f51fbc8aca961874607f1f3a6a91c95a0e1397e3d702b013a9ab3cfcca7b08340414f977dcc9af7ee01610bdf8b60ce6bcea3bffab6156d80b2063f008
+DIST Mozilla-PublicSuffix-v1.0.5.tar.gz 87014 BLAKE2B fef4cb6c255eedd4f98392a422ddd0559231dcfd0c73031397f709b8863012f682ddc8c67cffd3f175035718f25bf04577ed92fa770405fe78838a2c71fb65d0 SHA512 3c8932dd9b3ee365e2a511bccfb324152c3fa13bdf795d9ff669b505d0385e212fd6d3991fc80a794e7398ca1cc0e4ea307f45df6a04e295a59fca83abfa7794
diff --git a/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.0.ebuild b/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.5.ebuild
similarity index 74%
rename from dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.0.ebuild
rename to dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.5.ebuild
index 52fb6f28cf0e..aaa8dd517630 100644
--- a/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.0.ebuild
+++ b/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.5.ebuild
@@ -1,26 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DIST_AUTHOR=RSIMOES
+DIST_AUTHOR=TOMHUKINS
 DIST_VERSION="v${PV}"
 inherit perl-module
 
 DESCRIPTION="Get a domain name's public suffix via the Mozilla Public Suffix List"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-no-dynamic-update.patch"
-)
 RDEPEND="
 	virtual/perl-Exporter
 	dev-perl/URI
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-IO
 	>=dev-perl/Module-Build-0.280.0
 	test? (
@@ -28,6 +23,11 @@ DEPEND="${RDEPEND}
 		virtual/perl-File-Spec
 	)
 "
+
+PATCHES=(
+	"${FILESDIR}/1.0.4-no-dynamic-update.patch"
+)
+
 src_test() {
 	perl_rm_files t/author-* t/release-*
 	perl-module_src_test
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0-r1.ebuild
similarity index 81%
rename from dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
rename to dev-perl/NetAddr-IP/NetAddr-IP-4.79.0-r1.ebuild
index b1a98a32c69b..42b3cf7961d6 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=MIKER
 DIST_VERSION=4.079
@@ -12,12 +12,14 @@ DESCRIPTION="Manipulation and operations on IP addresses"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
+IUSE="ipv6"
 
-RDEPEND="ipv6? ( dev-perl/Socket6 )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	ipv6? ( dev-perl/Socket6 )
+"
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
+
 PATCHES=( "${FILESDIR}/${PN}-4.079-no-sleep.patch" )
diff --git a/dev-perl/mecab-perl/mecab-perl-0.996.ebuild b/dev-perl/mecab-perl/mecab-perl-0.996-r1.ebuild
similarity index 80%
rename from dev-perl/mecab-perl/mecab-perl-0.996.ebuild
rename to dev-perl/mecab-perl/mecab-perl-0.996-r1.ebuild
index adbae9099c7d..3fba3b5a2cec 100644
--- a/dev-perl/mecab-perl/mecab-perl-0.996.ebuild
+++ b/dev-perl/mecab-perl/mecab-perl-0.996-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit perl-module
 
@@ -12,10 +12,10 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
-IUSE=""
 
-DEPEND="~app-text/mecab-${PV}"
-RDEPEND="${DEPEND}"
+RDEPEND="~app-text/mecab-${PV}"
+BDEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README test.pl )
 HTML_DOCS=( bindings.html )
diff --git a/dev-perl/mime-construct/mime-construct-1.1100.0-r1.ebuild b/dev-perl/mime-construct/mime-construct-1.1100.0-r2.ebuild
similarity index 86%
rename from dev-perl/mime-construct/mime-construct-1.1100.0-r1.ebuild
rename to dev-perl/mime-construct/mime-construct-1.1100.0-r2.ebuild
index beb8dbcc95a4..4a2e38667ad3 100644
--- a/dev-perl/mime-construct/mime-construct-1.1100.0-r1.ebuild
+++ b/dev-perl/mime-construct/mime-construct-1.1100.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=ROSCH
 DIST_VERSION=1.11   # the author made 1.11 follow 1.9, so we need to be creative
@@ -12,7 +12,6 @@ DESCRIPTION="construct and optionally mail MIME messages"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
-IUSE=""
 
 RDEPEND="
 	virtual/perl-MIME-Base64
@@ -20,6 +19,7 @@ RDEPEND="
 	dev-perl/MIME-Types
 	dev-perl/Proc-WaitStat
 "
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+"
 
 PATCHES=( "${FILESDIR}/${PN}-add-date-header.patch" )
diff --git a/dev-perl/multidimensional/Manifest b/dev-perl/multidimensional/Manifest
index ddf854a53cd3..26bc769d9d29 100644
--- a/dev-perl/multidimensional/Manifest
+++ b/dev-perl/multidimensional/Manifest
@@ -1,2 +1 @@
-DIST multidimensional-0.013.tar.gz 67528 BLAKE2B 8167da19e5bc0f28547277580cefa871031b7dc129fc6eae521ecc4e5e5714b38b5c5b32446dc41123b6d79c93fd7399e6cd4f33d244d85e937deaa5831ffa2c SHA512 9abc93efd0060042f16c9e89c37a11a08c781ab2d095964701661a17f4adfeaf7cf3cb134db9c91a366b5ddda482716eda5d3b002fdb38fa4694d7e24dbc76f6
 DIST multidimensional-0.014.tar.gz 66968 BLAKE2B 0496081f7ea4b0c33e5805b85213fa582d58218d7e50614ae0a8660b1d28f823eeed3023f2fd10bb9055e89e38d365f4c1e9741fdaba0d6bc5fe1f67d7a8c461 SHA512 94c9dabb3023165a8dd140ef791e4aab980e3b604eae06ed0e29290aab67a9302f2cde4c8b394de0b4c55c5f78ce4510db902d615d665bf60b12ec409f341043
diff --git a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
deleted file mode 100644
index 1cf0d42d0e8f..000000000000
--- a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ILMARI
-DIST_VERSION=0.013
-inherit perl-module
-
-DESCRIPTION="disables multidimensional array emulation"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/B-Hooks-OP-Check-0.190.0
-	>=dev-perl/Lexical-SealRequireHints-0.5.0
-	virtual/perl-XSLoader
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	dev-perl/ExtUtils-Depends
-	test? (
-		>=virtual/perl-CPAN-Meta-2.112.580
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 319d579d0fe9..2d945609e7d4 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/ansible-compat/ansible-compat-0.5.0.ebuild b/dev-python/ansible-compat/ansible-compat-0.5.0.ebuild
index 4001784180fa..7b7537c2f7bc 100644
--- a/dev-python/ansible-compat/ansible-compat-0.5.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-0.5.0.ebuild
@@ -33,6 +33,20 @@ BDEPEND="$(python_gen_cond_dep '
 	)
 ')"
 
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
 # Requires currently unpackaged Sphinx extension myst_parser
 #distutils_enable_sphinx docs 'dev-python/sphinx_ansible_theme'
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f96d08f2755a..854f4fe872c1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,7 @@
 DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c908318c507a7cde1eef0c36d8fe3a5d3be0f8c6178edfdd8bc82adf112f297a5f127cd2b442ce10fe4d37b3a21fa4 SHA512 631d8f618fb6d55b338b563e72e1ccc751b8937bb2660d033b885951ea5ec3ac6902f8c7b9918664d764be84fdef5af4e7a87d444cbc154ebf5ae06908f90714
 DIST boto3-1.19.12.tar.gz 436654 BLAKE2B f92e756bc9f98105e3126e41cf0d6fab948bbd79f088ee4e0f0f5f319d4a6e542c0702b487404b316f794b304c43f9c26da026257476341971a7ce241538f506 SHA512 e6b20730f35bb422a2f74e978adc0bac77aa18b4e80eab5175dc117cf2762a7d8e53d390c50df24dada6f1d071d78309c69598ffb3f8d93fd45a3d1f772a866f
 DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455fc862daa700326ae1df258979211d2753f01e1a106f237de393e483dc8926bb4ef0e08bafa575f20811dccd55 SHA512 fad05102f0c3e7e30a3342009f6b3ae28f52758f17a0c22b4da9a03dd10d7f9149ea2ec0119f55ec7280824bd8173653271821e82fcd54ef9fb9161b2d62df70
+DIST boto3-1.20.10.tar.gz 443886 BLAKE2B 891c5d45eed9fc0afac3e6e87f5f7d2100da779b6d863146d8a0804ed8caa732024d21cbd396a681067088080fc9b4e9afc3634d0f3e2483fa8ad5203e703054 SHA512 36ea0170aa62dba8f01f49d975c34dc3fa180ea82d583619844755d9eb8f5e5d141bce2ac044c1fee8dba4ce71ad5dc93b527e5ed4efbf303ef8abaae90b0a47
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 DIST boto3-1.20.6.tar.gz 440133 BLAKE2B b154714261372cebb8643d529b66fe3a42d30e056cf2a454092d598c51d0cdef723980834be6a36abb892d3022ae8ef67053b22bb176f540e67c3f37422155d8 SHA512 d8d66a761f03beeca10fea8446de1136d418a93b21065aebfefcafe2abfd9b5bbfa243594f54647ad80547e48348086e2be2de129b89f9ca71f308579f11a0b7
 DIST boto3-1.20.7.tar.gz 440428 BLAKE2B f1b2b36799e6c22a40c04226443f15f9174d68a02d2f731df84f6ff0962158e9d940ae5bc04d25fe99a74f105946026ccb66547838734294d649d661071c1e3b SHA512 85493a85789caa5453a4dafa1472c8ecd75c05a819227909092ae03690243eb103c1588cb10e5e5277ab9df49673b9b54fda064a412bdcf6b9e11238b277f450
diff --git a/dev-python/boto3/boto3-1.20.10.ebuild b/dev-python/boto3/boto3-1.20.10.ebuild
new file mode 100644
index 000000000000..a4f6b1d0f3c2
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.10.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~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}]
+	)
+"
+
+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}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 1c6da427abf2..4f46617536df 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,6 +1,7 @@
 DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e07ee4348e730e6b4d11285f3030f676f0efda58a72dd92cac8c6ba0cb57f8f879eb5298009ecbd227904d18a453bf SHA512 955d24d2d486524af7bee57a56e2e903458030420198f3e6ab49d61be52b812a98444a9d0f86503b121270d6642345ffad6053ad143374dc56ab908b385afb0a
 DIST botocore-1.22.12.tar.gz 8343683 BLAKE2B df7b2c86f226df14dc8181e8506acc7dd660797311049e2342ec721e853af1158c845749a8143ec6677601420ce6140173da8df5d9e4550cdf9becfc944ebd3c SHA512 0ab78902711960f8373a91af379b4981ab29646cc9f94e49836deaa432695c503879ed0bbbf54e3641e50933b5ed658e48052ca2b8b8391f705284d9abd24c1f
 DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58d2240c6b7301cf632969a4a73cf4a1d51c8c68c8def27653c10041d2163ad7ca800dcf6fd07972b506bf2566cae3 SHA512 710a9eeee03dc79ca4ffacc4974f09ca769e1e3b8cb143f6f0349240dd8c2af8ee526a1dadb7310a26019363f683fc4149cb4c73d8b94a856a384fab7f84fb5c
+DIST botocore-1.23.10.tar.gz 8429267 BLAKE2B bcad034d600f17317e1036225a789c143d75ee2375965df60b3398d898fb49e5ceee7a5ac99cd7fb5f44f2bd89da7cee9406df6b493a53c93fcce5363d7735e5 SHA512 c2782cb8e360f1a921a0e630f2a6cc0f97f1ff0a974e89d95c0b602f201ebffe29a507759e9a83153cc3d9797f057d7bc6e4f6568f6965a7448be04b479c5b55
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
 DIST botocore-1.23.6.tar.gz 8387968 BLAKE2B 415a177d591a0ef369f17b8f02563be0fb53bc4e65c2767f41ca11300939585a10146874b6ac5297cdd3dcb36cf6fd2065fd09f3c612c4ba1d954b03a5b15579 SHA512 a46e45b7bb67d7c4bcc5508f38448b9ed3778ed6b6080239459b22b7f753adaf12e8d64496f7d7c71b33bb17ae1744000e9269ea0f545286e56fabe39e7f0340
 DIST botocore-1.23.7.tar.gz 8391467 BLAKE2B dd6cad44c1b8109b76c44bfffa45e74da0fbeaa027429860640e33134dc5f6e5bb813b46d8b662d80b89af46d437c6fb962f0e0ab1edbeca3ee790f3b6d029bf SHA512 a3270da3b6d906bc2372af221400e14039868598ccd56f40f976bcc2638f300ae9990ff367f76e5b5cdf8d46a8a37716865f9a40ca7e79b73a5b8dbcb2b1af7f
diff --git a/dev-python/botocore/botocore-1.23.10.ebuild b/dev-python/botocore/botocore-1.23.10.ebuild
new file mode 100644
index 000000000000..7337877443c9
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.10.ebuild
@@ -0,0 +1,64 @@
+# 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="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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${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}
+}
diff --git a/dev-python/debugpy/debugpy-1.5.1.ebuild b/dev-python/debugpy/debugpy-1.5.1.ebuild
index ef7014d110e1..afcbb13ed0a2 100644
--- a/dev-python/debugpy/debugpy-1.5.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # There is not enough time in the universe for this test suite
 RESTRICT="test"
diff --git a/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild b/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
index 858eed306ca6..05273cc31ae3 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
index 4caf7e1ae1df..0f0ca2f35be9 100644
--- a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/nose2/nose2-0.10.0.ebuild b/dev-python/nose2/nose2-0.10.0.ebuild
index 7ad2cb0ecbf1..b4dd054b2f5f 100644
--- a/dev-python/nose2/nose2-0.10.0.ebuild
+++ b/dev-python/nose2/nose2-0.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pydevd/pydevd-2.7.0.ebuild b/dev-python/pydevd/pydevd-2.7.0.ebuild
index bed6e4ba7b14..0826d47e6691 100644
--- a/dev-python/pydevd/pydevd-2.7.0.ebuild
+++ b/dev-python/pydevd/pydevd-2.7.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 0dcc19893f3f..eecec9ef872f 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,2 +1,3 @@
 DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f
 DIST pygit2-1.7.0.tar.gz 276292 BLAKE2B 6091e2916c4986cb545f23d3a31f262666f0349661ccc48769414e888d0ede48af3a80483b4638a3a2275b74ed9b42113bdeae678f03d76caa7e796c6011b50c SHA512 3a8654036d0ab875898ce60e81bcab48bdb6d6bd63c29dc98272c71b5c82391e3186da61083fba09faf722e176fed5c592a36edb53ae0b957726e74646d25616
+DIST pygit2-1.7.1.tar.gz 281791 BLAKE2B 51f7f23752acf0abf6000f2262019db7503506267f0f5306bd53e0e15378447d2da564818c1b6efccc4759587aba6b4d7b142c760e4e2796445cd6056e949825 SHA512 a6232039b6364c7a0905aba20f7e27b43892b7067fa95fdd464438869453360ecdb885f2012cdf0eb0734c91dc79b60db894d1d0fee81922b9fb3cf920950937
diff --git a/dev-python/pygit2/pygit2-1.7.1.ebuild b/dev-python/pygit2/pygit2-1.7.1.ebuild
new file mode 100644
index 000000000000..985c2e9d1536
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.7.1.ebuild
@@ -0,0 +1,40 @@
+# 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="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-1.3*:=
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	epytest hack/test
+}
diff --git a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
index 24d1bb788cb1..eb1922f29a57 100644
--- a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
+++ b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eugeniy/pytest-tornado/archive/refs/tags/v${PV}.tar.
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
index d5a1218ffcbe..b9e02fa15460 100644
--- a/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
+++ b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
@@ -12,5 +12,5 @@ SRC_URI="https://github.com/FrodeSolheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 RESTRICT="test" # The tests don't work, they're probably outdated.
diff --git a/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch b/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch
new file mode 100644
index 000000000000..5a6b27324d82
--- /dev/null
+++ b/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch
@@ -0,0 +1,98 @@
+diff --git a/tests/_device_tests/_attributes_tests.py b/tests/_device_tests/_attributes_tests.py
+index 23fa6da..7baf043 100644
+--- a/tests/_device_tests/_attributes_tests.py
++++ b/tests/_device_tests/_attributes_tests.py
+@@ -50,7 +50,7 @@ class TestAttributes(object):
+     """
+ 
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_getitem(self, a_context, device_datum):
+         """
+         Test that attribute value exists and is instance of bytes.
+@@ -60,7 +60,7 @@ def test_getitem(self, a_context, device_datum):
+            for key in device_datum.attributes.keys())
+ 
+     @given(strategies.sampled_from(_DEVICES))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_getitem_nonexisting(self, a_device):
+         """
+         Test behavior when corresponding value is non-existant.
+@@ -87,7 +87,7 @@ def test_non_iterable(self, a_device):
+             a_device.attributes['key']
+ 
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_asstring(self, a_context, device_datum):
+         """
+         Test that attribute exists for actual device and is unicode.
+@@ -97,7 +97,7 @@ def test_asstring(self, a_context, device_datum):
+            for key in device_datum.attributes.keys())
+ 
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+-    @settings(max_examples=10)
++    @settings(max_examples=10, deadline=30000)
+     def test_asint(self, a_context, device_datum):
+         """
+         Test that integer result is an int or ValueError raised.
+@@ -111,7 +111,7 @@ def test_asint(self, a_context, device_datum):
+                     device.attributes.asint(key)
+ 
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_asbool(self, a_context, device_datum):
+         """
+         Test that bool result is a bool or ValueError raised.
+diff --git a/tests/_device_tests/_device_tests.py b/tests/_device_tests/_device_tests.py
+index b9a84c6..2ce6751 100644
+--- a/tests/_device_tests/_device_tests.py
++++ b/tests/_device_tests/_device_tests.py
+@@ -352,7 +352,7 @@ def test_key_subset(self, a_context, device_datum):
+            frozenset(device.properties.keys())
+ 
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+-    @settings(max_examples=1)
++    @settings(max_examples=1, deadline=30000)
+     def test_getitem(self, a_context, device_datum):
+         device = Devices.from_path(a_context, device_datum.device_path)
+         for prop in device_datum.properties:
+@@ -372,7 +372,7 @@ def test_getitem(self, a_context, device_datum):
+     @pytest.mark.skipif(
+         len(_device_data) == 0, reason='no device with a DEVNAME property')
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_device_data))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_getitem_devname(self, a_context, device_datum):
+         device = Devices.from_path(a_context, device_datum.device_path)
+         data_devname = os.path.join(a_context.device_path,
+@@ -382,7 +382,7 @@ def test_getitem_devname(self, a_context, device_datum):
+         assert device_devname == data_devname
+ 
+     @given(strategies.sampled_from(_DEVICES))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_getitem_nonexisting(self, a_device):
+         with pytest.raises(KeyError) as excinfo:
+             # pylint: disable=pointless-statement
+@@ -390,7 +390,7 @@ def test_getitem_nonexisting(self, a_device):
+         assert str(excinfo.value) == repr('a non-existing property')
+ 
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_asint(self, a_context, device_datum):
+         device = Devices.from_path(a_context, device_datum.device_path)
+         for prop, value in device_datum.properties.items():
+@@ -403,7 +403,7 @@ def test_asint(self, a_context, device_datum):
+                 assert device.properties.asint(prop) == value
+ 
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+-    @settings(max_examples=5)
++    @settings(max_examples=5, deadline=30000)
+     def test_asbool(self, a_context, device_datum):
+         """
+         Test that values of 1 and 0 get properly interpreted as bool
diff --git a/dev-python/pyudev/files/pyudev-0.22-remove-flaky-tests.patch b/dev-python/pyudev/files/pyudev-0.22-remove-flaky-tests.patch
new file mode 100644
index 000000000000..dd5b892606a3
--- /dev/null
+++ b/dev-python/pyudev/files/pyudev-0.22-remove-flaky-tests.patch
@@ -0,0 +1,126 @@
+commit a35c394f7f4eb714eeaab1b8ed7977f822e29fa9
+Author: mulhern <amulhern@redhat.com>
+Date:   Wed May 2 15:50:45 2018 -0400
+
+    Get rid of all test_match_attribute_* methods
+    
+    These tests are rendered flaky by the volatility of attribute values.
+    
+    Signed-off-by: mulhern <amulhern@redhat.com>
+
+diff --git a/tests/test_enumerate.py b/tests/test_enumerate.py
+index f054799..c9c6a67 100644
+--- a/tests/test_enumerate.py
++++ b/tests/test_enumerate.py
+@@ -200,77 +200,6 @@ def test_match_property_bool(self, context, pair):
+            for device in devices
+         )
+ 
+-    @failed_health_check_wrapper
+-    @given(_CONTEXT_STRATEGY, _ATTRIBUTE_STRATEGY)
+-    @settings(max_examples=50)
+-    def test_match_attribute_nomatch_unfulfillable(self, context, pair):
+-        """
+-        Match and no match for a key/value gives empty set.
+-        """
+-        key, value = pair
+-        devices = context.list_devices()
+-        devices.match_attribute(key, value)
+-        devices.match_attribute(key, value, nomatch=True)
+-        assert not list(devices)
+-
+-    @failed_health_check_wrapper
+-    @given(_CONTEXT_STRATEGY, _ATTRIBUTE_STRATEGY)
+-    @settings(max_examples=50)
+-    def test_match_attribute_nomatch_complete(self, context, pair):
+-        """
+-        Test that w/ respect to the universe of devices returned by
+-        list_devices() a match and its inverse are complements of each other.
+-        """
+-        key, value = pair
+-        m_devices = frozenset(context.list_devices().match_attribute(
+-            key, value))
+-        nm_devices = frozenset(context.list_devices().match_attribute(
+-            key, value, nomatch=True))
+-        _test_intersection_and_union(context, m_devices, nm_devices)
+-
+-    @failed_health_check_wrapper
+-    @given(_CONTEXT_STRATEGY, _ATTRIBUTE_STRATEGY)
+-    @settings(max_examples=50)
+-    def test_match_attribute_string(self, context, pair):
+-        """
+-        Test that matching attribute as string works.
+-        """
+-        key, value = pair
+-        devices = context.list_devices().match_attribute(key, value)
+-        assert all(device.attributes.get(key) == value for device in devices)
+-
+-    @failed_health_check_wrapper
+-    @given(_CONTEXT_STRATEGY,
+-           _ATTRIBUTE_STRATEGY.filter(lambda x: _is_int(x[1])))
+-    @settings(max_examples=50)
+-    def test_match_attribute_int(self, context, pair):
+-        """
+-        Test matching integer attribute.
+-        """
+-        key, value = pair
+-        int_value = int(value)
+-        devices = context.list_devices().match_attribute(key, int_value)
+-        for device in devices:
+-            attributes = device.attributes
+-            assert attributes.get(key) == value
+-            assert device.attributes.asint(key) == int_value
+-
+-    @failed_health_check_wrapper
+-    @given(_CONTEXT_STRATEGY,
+-           _ATTRIBUTE_STRATEGY.filter(lambda x: _is_bool(x[1])))
+-    @settings(max_examples=50)
+-    def test_match_attribute_bool(self, context, pair):
+-        """
+-        Test matching boolean attribute.
+-        """
+-        key, value = pair
+-        bool_value = True if int(value) == 1 else False
+-        devices = context.list_devices().match_attribute(key, bool_value)
+-        for device in devices:
+-            attributes = device.attributes
+-            assert attributes.get(key) == value
+-            assert attributes.asbool(key) == bool_value
+-
+     @_UDEV_TEST(154, "test_match_tag")
+     @failed_health_check_wrapper
+     @given(_CONTEXT_STRATEGY, _TAG_STRATEGY)
+@@ -335,33 +264,6 @@ def test_combined_property_matches(self, context, ppairs):
+            )
+         )
+ 
+-    @given(_CONTEXT_STRATEGY,
+-           strategies.lists(
+-               elements=_ATTRIBUTE_STRATEGY,
+-               min_size=2,
+-               max_size=3,
+-               unique_by=lambda p: p[0]))
+-    @settings(max_examples=20)
+-    def test_combined_attribute_matches(self, context, apairs):
+-        """
+-        Test for conjunction of attributes.
+-
+-        If matching multiple attributes, then the result is the intersection of
+-        the matching sets, i.e., the resulting filter is a conjunction.
+-        """
+-        enumeration = context.list_devices()
+-
+-        for key, value in apairs:
+-            enumeration.match_attribute(key, value)
+-
+-        _test_direct_and_complement(
+-           context,
+-           frozenset(enumeration),
+-           lambda d: all(
+-              d.attributes.get(key) == value for key, value in apairs
+-           )
+-        )
+-
+     @given(_CONTEXT_STRATEGY,
+            strategies.lists(
+                elements=_MATCH_PROPERTY_STRATEGY,
diff --git a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild b/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
new file mode 100644
index 000000000000..622a38c9c9c9
--- /dev/null
+++ b/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to libudev"
+HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/udev
+	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGES.rst README.rst )
+
+PATCHES=(
+	"${FILESDIR}/pyudev-0.22-fix-hypothesis.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	if use test; then
+		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
+		ewarn "change it to /var/tmp to ensure tests will pass."
+	fi
+
+	# tests are known to pass then fail on alternate runs
+	# tests: fix run_path
+	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
+		tests/test_core.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 6777a1eef765..e927e9bb89ac 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,7 +1,3 @@
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
-DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
-DIST SQLAlchemy-1.4.23.tar.gz 7730769 BLAKE2B ad812a068beba3d55f629d4a3ee5eed6f61e46b19a7e1fcc717cfdd7a8d2cb759d894402a64550576b2cc28d82b53aa56ff4305d45433126a765909150a50450 SHA512 9e668b63487d0b9f9321a73bbf652aa82f31a90222429c4ba2f866edb0a313d8d10989febd456c87bdcde63ab595810232257fb011dce007538651426c1df0d1
-DIST SQLAlchemy-1.4.25.tar.gz 7776002 BLAKE2B 0c0330d07ab022925cdde0e94c4a33f699777239cc444f3ca31eeaf046b91b41dfe281861725af22a34d9641abb32b5e3558f684157bff9306c06b9333b89c99 SHA512 254d02f36df655638b204bbc8dbe6d32ce66e9f4a072cdb78dc7433b4d91b9cc88a3ec7a279ff2c818e0b794cc69debcb38310fa4734d9c295d067ed3dc33c22
 DIST SQLAlchemy-1.4.26.tar.gz 7836259 BLAKE2B 149c9947f5536a3715bb05f5bf72a58b597873f824aa492af0df1a0bcbb0e5d8ff848d171f9d12a9f3acc872d3b05df6e67ed79dc190e82d376df152ad150383 SHA512 0289bfc61391e330a8b3df0876727947c6ebd55b54922d3c6107e47a1da27fd6bf7087edbf259e1ef8e7359f53c73d833185f0bc72d307defdb56560bbb21902
 DIST SQLAlchemy-1.4.27.tar.gz 7907686 BLAKE2B a9751a82e81bcdcf1bd344f0275c0ff89df38c7e9eda4470d147f4b50b0a2a0d7e9861d932fb6382328ec0e2024d72279ea889e4dadd61a4a33fc3e085521604 SHA512 8d1d76596b1698e320305a07e3f0a56607568ef60b6be36c86c0cabc843c8d6d62034d7446eef69f0cd0687de474d34ce1161c1adb9fdeea8c0b47af372015be
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild
deleted file mode 100644
index 62775f2cdaaf..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=()
-	if [[ ${EPYTHON} != pypy3 ]] &&
-			! has_version -b "dev-python/greenlet[${PYTHON_USEDEP}]"
-	then
-		# skip tests requiring greenlet
-		deselect+=(
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_lazy_init
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_async_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_fallback_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_no_greenlet
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_contextvars
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_ok
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_propagate_cancelled
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_require_await
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_sync_error
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_error_other_loop
-			test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]
-			test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]
-		)
-	fi
-
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.22-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.22-r1.ebuild
deleted file mode 100644
index 40b28239f212..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.22-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=()
-	if [[ ${EPYTHON} != pypy3 ]] &&
-			! has_version -b "dev-python/greenlet[${PYTHON_USEDEP}]"
-	then
-		# skip tests requiring greenlet
-		deselect+=(
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_lazy_init
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_async_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_fallback_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_no_greenlet
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_contextvars
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_ok
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_propagate_cancelled
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_require_await
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_sync_error
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_error_other_loop
-			test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]
-			test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]
-		)
-	fi
-
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild
deleted file mode 100644
index ea00fb36c7b1..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.25-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.25-r1.ebuild
deleted file mode 100644
index 2cf4410dacf2..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.25-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/untangle/untangle-1.1.1.ebuild b/dev-python/untangle/untangle-1.1.1.ebuild
index 00548a001d0c..124bd4c0b7d8 100644
--- a/dev-python/untangle/untangle-1.1.1.ebuild
+++ b/dev-python/untangle/untangle-1.1.1.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 6567fa3a22ab..23757e8d3688 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1 +1,2 @@
 DIST zope.testrunner-5.3.0.tar.gz 141406 BLAKE2B f3434e9f22514fffe912385f61d163e42ba1dcd9e9d3f2b3f1d504b608c73804fa38b14a5ed1bf288b75b98ef106024a27de925c404ad67be6acc6c1d6c8f06d SHA512 6fd9375c7b58847868aaf04e85722fcc2b1fe7a8e4ae2ec9103dcb091e6f837d649557ba014146876f814345240b20863bf1584f32212b0b1b28c38ed343b87a
+DIST zope.testrunner-5.4.0.tar.gz 132150 BLAKE2B b8367e9d4ac32923099424e0c7a3f00ddb540f966eae05ebced6a6d49ac698e2a07449bb25d26d59d57ef00d3040c8a5f0c03cc53878c01ecfb1cde671780fc8 SHA512 c8c6cbbd2cc352f52068ada3c23305cc270736aaa20c14f7c218bc40d6873cb8e8ecb4e2e1601b8833d32e91ac87e0067515458b96194cfc23b6d02cb71613f2
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.4.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.4.0.ebuild
new file mode 100644
index 000000000000..917ad53f7ef0
--- /dev/null
+++ b/dev-python/zope-testrunner/zope-testrunner-5.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testrunner script"
+HOMEPAGE="https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-exceptions[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e2297662b0f1..9fb678ebdc34 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index 7629c671dfa1..40b593336a0e 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,2 +1 @@
-DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224c97e3deb90f4fef051dbcecd6a7d3c979fe6b7e6c9aac64d485b9c4324b4d666a7ae64cb82cd325498d33e0cae SHA512 cb9245fbec7a4a15822a5b70d7052be200aa8b574b528dd929121597eb7dcec97532b0fd4d6a4d6bb63676194ed0ab2129e106fb88f63561187620ec431f9efb
 DIST topgit-0.19.13.tar.gz 355721 BLAKE2B 0f70d7720d0ca2f7724fe5fa3bb100c7f812c0bb18fd9acb4897487d90f31da957bc0b4e47e9dcdd08594366fb31c4f46447cf78989f828f337edd8f8f231bf3 SHA512 8e477504c5f873651854c9412864c9dcb0ee35d0349b65e7c5d618a0add0fad3f749381edbe17195981bae3ff9f0e7323286abf7a5c6b744721ba2cc2a5d40d4
diff --git a/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch b/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
deleted file mode 100644
index 23e54f886494..000000000000
--- a/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 3df81dacc84bc20471542855139c5b1948409412 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Wed, 26 Aug 2020 15:27:06 +0300
-Subject: [PATCH] Rename $(T) to $(TESTSUITE)
-
-$(T) is used in Gentoo for temp directory during builging package.
----
- t/Makefile.mak | 8 ++++----
- t/Makefile.sh  | 6 +++---
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/t/Makefile.mak b/t/Makefile.mak
-index bf8805c..73f6171 100644
---- a/t/Makefile.mak
-+++ b/t/Makefile.mak
-@@ -116,11 +116,11 @@ test: pre-clean TG-TEST-SETTINGS $(TEST_LINT) FORCE
- 	$(Q)set -m && $(CACHE_SETUP_TTY) $(MAKE) $${GNO_PD_OPT} -f Makefile.mak aggregate-results-and-cleanup
- 
- prove: pre-clean TG-TEST-SETTINGS $(TEST_LINT) FORCE
--	@echo "*** prove ***" && set -m && $(CACHE_SETUP) $(PROVE) --exec $(SHELL_PATH_SQ)'' $(TESTLIB_PROVE_OPTS) $(T) :: $(TESTLIB_TEST_OPTS)
-+	@echo "*** prove ***" && set -m && $(CACHE_SETUP) $(PROVE) --exec $(SHELL_PATH_SQ)'' $(TESTLIB_PROVE_OPTS) $(TESTSUITE) :: $(TESTLIB_TEST_OPTS)
- 	$(Q)$(NOCLEANCMT)$(MAKE) $${GNO_PD_OPT} -f Makefile.mak -s post-clean-except-prove-cache
- 
--.PRECIOUS: $(T)
--$(T): FORCE
-+.PRECIOUS: $(TESTSUITE)
-+$(TESTSUITE): FORCE
- 	@echo "*** $@ ***"; $(SHELL_PATH_SQ)'' $@ $(TESTLIB_TEST_OPTS)
- 
- # How to clean up
-@@ -169,7 +169,7 @@ test-lint-filenames:
- 
- # Run the tests without using prove
- 
--run-individual-tests: $(T)
-+run-individual-tests: $(TESTSUITE)
- 
- aggregate-results-and-cleanup:
- 	$(Q)set -m && ec=0 && $(SHELL_PATH_SQ)'' -c 'TESTLIB_TEST_PARENT_INT_ON_ERROR=$$$$ exec "$$@"' $(SHELL_PATH_SQ)'' \
-diff --git a/t/Makefile.sh b/t/Makefile.sh
-index ca2cf9c..dc94168 100644
---- a/t/Makefile.sh
-+++ b/t/Makefile.sh
-@@ -35,12 +35,12 @@ quotevar TEST_RESULTS_DIRECTORY TEST_RESULTS_DIRECTORY_SQ
- 
- v_wildcard ALLT 't[0-9][0-9][0-9][0-9]-*.sh'
- v_sort ALLT $ALLT
--[ -n "$T" ] || T="$ALLT"
--[ -n "$LINTTESTS" ] || LINTTESTS="$T"
-+[ -n "$TESTSUITE" ] || TESTSUITE="$ALLT"
-+[ -n "$LINTTESTS" ] || LINTTESTS="$TESTSUITE"
- 
- # Extra shell scripts to run through check-non-portable-shell.pl
- # These will ALWAYS be "checked" whenever the test-lint target is made
--# By default all $(T) test files are checked so they don't need to be
-+# By default all $(TESTSUITE) test files are checked so they don't need to be
- # in this list
- 
- v_wildcard LINTSCRIPTS '*.sh'
--- 
-2.26.2
-
diff --git a/dev-vcs/topgit/topgit-0.19.12.ebuild b/dev-vcs/topgit/topgit-0.19.12.ebuild
deleted file mode 100644
index 7a7635c00079..000000000000
--- a/dev-vcs/topgit/topgit-0.19.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A different patch queue manager"
-HOMEPAGE="https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit"
-SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="sys-apps/sed
-	virtual/awk"
-RDEPEND=">=dev-vcs/git-2.10.0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Rename-T-to-TESTSUITE.patch"
-)
-
-src_compile() {
-	# Needed because of "hardcoded" paths
-	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" sharedir="/usr/share/doc/${PF}" install
-
-	newbashcomp contrib/tg-completion.bash tg
-	dodoc README
-}
diff --git a/dev-vcs/topgit/topgit-0.19.13.ebuild b/dev-vcs/topgit/topgit-0.19.13.ebuild
index db08bc6d9eca..22d15a089a9b 100644
--- a/dev-vcs/topgit/topgit-0.19.13.ebuild
+++ b/dev-vcs/topgit/topgit-0.19.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-lang/perl
 	sys-apps/sed
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 5fbaace90ce1..9251569b54ec 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
index 30df2b2f322b..d329b09274d5 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
@@ -36,8 +36,8 @@ RDEPEND="
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)
 "
 
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 468600faddfd..29e4849cae37 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 138782298acd..5d95881b840c 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -252,11 +252,76 @@ DIST thunderbird-91.3.1-uz.xpi 588119 BLAKE2B 33956448279338ca6d5e6c55bc76ddce28
 DIST thunderbird-91.3.1-vi.xpi 706358 BLAKE2B 7cfdb545b0c532f9077d7266e443e4692c237a26ca73ea9c68bf865ea4f9626b38d70da4f52001757b80f3ab77532a58c0daf64d3c02963358979a840a876f72 SHA512 1babc23023da7a6811dd1b1ad73165e2deadba18070b4c271395652e832486d9555d6b51e549bbcf8cc29b18d7971da6cdd625e971543f3500a558afa1b7aa0e
 DIST thunderbird-91.3.1-zh-CN.xpi 714607 BLAKE2B c9edc522533149bb7ae3e753daa15b77581c67d2c2372b783ac86489c98d5fb1b167982f94ce7d535a2a9b8b47c3a1a1cd62ece804c708ba926dc05d245f5401 SHA512 66556244cbf6e700dcbba0b61d0561ed848941e9e929e37e96c47060ce8c98ec3ff064d7e1c95082fa2b6e6e9e29b8f9a93eab7623b4ca62d1b4a84c877585a6
 DIST thunderbird-91.3.1-zh-TW.xpi 715955 BLAKE2B 1e8d785f749cc9825989992ff8e8ba4f2094742c383dab5bd3638c4af34d3d4b85eeb23bed98cf8c030b24e25115fa6de87db5439a5cd0663f41fb19df465620 SHA512 87610a5e557a04b3e0bb0fdc1970fa294681d0f7607b46228980be56e7737698e3edad46647c8b7be67d22d7c3033bff5d6d7dab6ae8fea2284ccbb0f5516b93
+DIST thunderbird-91.3.2-af.xpi 560247 BLAKE2B 38c67858d7d20b7ef3c0148b13b261e47dbcac6b58c4cbae03abcbc8a12f60cc06632df26b99db499dc5581fda11fe94599904dec291bfc196a9e375049df07a SHA512 19352b7210a0edf2770a3d174fac12be53719e82adc42911e37736bdb8f9f5d5320dad1f583c79bbf067a2aa21e2d8f8152db8aef91406e571e6f709c569a781
+DIST thunderbird-91.3.2-ar.xpi 660313 BLAKE2B e0c82ea24c98978341366cddf3a65fcd0e80e369fffe86e83b9bf66fd39a0c876865abbd9b56fa3b7b729aabef14e6d24de7a63b23e5b7909479781058de497f SHA512 61555c72082338f7b1550a76809577edf0f3df67aa3c5fc66ba8cbca95272ff9cb15e70bc7e846936038fd7939460cb7dcda63878fbdca2ce44dd9a848ef5c78
+DIST thunderbird-91.3.2-ast.xpi 577052 BLAKE2B 079ebab5eb77843bb4d3139080af7f9845afa74be48258af92b6c7c191957f97df40e577f83fa8a8c2f93269e322eb4de44057be0db58007428e83a2723418d6 SHA512 b05517ca2ff26b308c78e7e601533464fb8b1816b081553a99bc0daf9393af39ffe68a16bc28fc2b9ab6200ab81b889ba9005b500bd0258aa9ab7f4dcacc6f48
+DIST thunderbird-91.3.2-be.xpi 687227 BLAKE2B c2bfd7388282ba3098a36628b7841dd61a20877014df538539dcd29269386b98775e570ad1b5ea3e7bca79c19afa9cd1e2e886cbef878e72e7463a18ff3832ff SHA512 1ac362e2e581c92f8ba1d68e6a1aea35c5a2450bcf46d60ed6e9a24aa602fca60f8a474ca995f0a740f0315bd5c1594006a67df9fd52f039fa7733e2d4ea06ad
+DIST thunderbird-91.3.2-bg.xpi 686416 BLAKE2B 4c6d176964274acac85d3d79661744dcaeab77f4f1c2b94e7dfb9e1addb28b7d3d219897026ed568184fccb85fb2779da944d26c3399ac86ab74f0bbadfa316d SHA512 56dd370da78e783dd1cfafb5b7f3e32ac1dd23967dcea9d257aa5132334e29967e69de96a30fda4d71aa3d4abf6179824ca3a10641e284002c158001ceb2fa08
+DIST thunderbird-91.3.2-br.xpi 616018 BLAKE2B ff4413e928389f1467ce172a99bbf98028cbc8ada135191992751ac79dfe09b1ca7b7ab99dd5d0eb42e8ecd9ba3acc5d9c6a11a591482c689a2eec55a21e09ca SHA512 37526df45b3db0aba6016fa681eb01b294493c2c937a4923d63fbc8f0bcf7840623e24eda5e48784e4d7b8414cd7a52b69ce4934bb9dc218187335789e681bde
+DIST thunderbird-91.3.2-ca.xpi 641158 BLAKE2B cb34a99bc522dc8f183f18a22d1d8feebfb9d4ada3e815a75e0daca88449c93733f9896028017bf9259de3fe726edcf030df0e4fa51f51ba5c5d9d2956e7521b SHA512 290af4ab5e14d3dff3738049af519896ce0b75a173b4d3b9558405bd5c79b0b4a6dc6af4ecffd7eaceb28882a511a1cd6a33c5a118959617289f8c2878045295
+DIST thunderbird-91.3.2-cak.xpi 647217 BLAKE2B 1d18eb059f934c8287530c4c39fe23754e39985e652c2e00255e6eaf2bcff590e27c3f0bcb16aa1b2e42207eec3cd04cd99b67efc4db380f0259c1f03b5d6aac SHA512 8c9219ae0580cff202cd368fb1cc006eac1cf41ea38ab1cdeaf6db54469281051f695bfc24e466a70cb7f7d8f3ca53bf436ad9d721831aa0ab9bc7666e39a269
+DIST thunderbird-91.3.2-cs.xpi 698287 BLAKE2B 7a80b95fc48c1efdc649f375f8e67ba6128fbc056638c3db45665752c4289cb3be10b15436aa65f280a58033532a85fba7f4473c6a3d17302c02a6a2c96542da SHA512 f29f45956775496a2b8c50442155ac16aa58389d558c75b38e186f7d46a9aca60c38e8626e05bda09c16fb5be40342d5479f55ff797bbe13e067f0eb6845a1c1
+DIST thunderbird-91.3.2-cy.xpi 673997 BLAKE2B e732eaa0f9b662ecd08e079b25970a72a153d0020915d26644d75eb3b97608dec918e0bc85c595067da70910725cf3f82e886781db1b71a209c1302a470c260c SHA512 d06281cffaaa38e3c1e3192c38b26c875cb2d032821bf5f0889ffce462dc6df5ca7027b2a145a0eae3bb957451640e9f385fbba4af497fe35c55a647596bed8f
+DIST thunderbird-91.3.2-da.xpi 655951 BLAKE2B f6417f8523ceec63f56d2113171be49fc984deb6f833ef8bfae35e7fec47170d801c1b1039392dfb4d8d25e41eeb576af9f1d11f37ecb30c833c00f99fc99978 SHA512 e5e19c0d02ae421aed818e55760883e43a30084e219df81dc68b25f2560843da1531b0c0cf011af7e4dfd35e921485c3305078545e1d96c22683dffc7cdf6e9b
+DIST thunderbird-91.3.2-de.xpi 687003 BLAKE2B ae3aea3630d4d53d100ee58e85fd64d2622e9dcf91bab240608a71a8d50ee80c8d2f0cba9b0e47b0519b982690daf6c09980d2c66da47f179730ee9013da9151 SHA512 5f55286aaa5f86d010caa3cc3e66bd574b715eb63a6189ed25cb4bd6205f519ad974f0b5185a0787e000a3e7cb1afc3c4efde908cf2d8ec78c0ba74e5bd16b05
+DIST thunderbird-91.3.2-dsb.xpi 707237 BLAKE2B 408e1e2659f1adf6a7473aa9039e983bf76d887b1ceb4499a09839cee0f870632bee34bee5784351ac317466f54f140400ee864125ab9636dc09f8275417c89e SHA512 5713163c6f9cb6eaf06e7b1ee2ecbf5dce9adfa905bf672db77d89859d9a1a9ca780d699921f64d298b8844c4c51890694460303f2dcb148fd1d2f290961b08a
+DIST thunderbird-91.3.2-el.xpi 803551 BLAKE2B 3c087b5fbb72d0552c80fda9d2a9e0534f4453ca2680eb6e5a9ee63a2993c4a965471319bcc78b92e8004ae5fe48b9975d1e39cb68a9dfa748ef59d12d131d8d SHA512 9b7fe4a982d7c659eff134f8f77a4a6c342aeeab4211ee680dd46f967e27edc2965a949d2faa5e5c56a98bc6d50ce8307a4cce0e8a41760c856557729503c756
+DIST thunderbird-91.3.2-en-CA.xpi 634128 BLAKE2B db114f45dc2f39a844d6ee91ef66f442dd7ea85a431d7fbd1db16ef13f7ce0745fc6384e860b9efe3bf8b387abfc5856f4d00fe48e2b4524d305631c1194a382 SHA512 748164d529f6cc3ef998cd1fe8b26f3e6d36298b02d2d988572135f7cdee781daf2857bc772cec726a4a79cc82fbc25fe61f70cf0c4ee1d35d50da6ccde22158
+DIST thunderbird-91.3.2-en-GB.xpi 636515 BLAKE2B 7718d5e0045fe393ea56cf759da60f3ebc603ecf1ced736d53035a6fe95599994ec9bb0b60e6d14740b362b5be2f7241b9207483df9cdec430c4a446e00576a7 SHA512 ceff847838893ae23c088213a5454f70ccba8a84763be57d63de6f52e98dcb15b82f9f13b24fa09cb3341560e2a450467db13fb3f4aff6f399d8cda05c34a270
+DIST thunderbird-91.3.2-es-AR.xpi 685105 BLAKE2B e35fc668ba7105107fd1a7e7bf57a24f73d7f018efa8304e882f60d455a010c4a6b36e4d4c3c1b8a8c9e9f0b82db0df307831a655d183fc8d122d6d1d07c8de0 SHA512 2a414d9365bacb223ca84c0fd83d86bcb17d39563adcd61244170919ec873b257f3e8a88d128a0d5cd54eca94c705e1b7633d538e552b7dc0638f99c0bf54339
+DIST thunderbird-91.3.2-es-ES.xpi 573862 BLAKE2B d295efe75600f921f489a745e7ec9507427fab5b2dd72576bf3a72133ad05090d865d6d7acbf14df5e670369f69b5db46f29ed43a9e0372d0e34f149c54b334e SHA512 226d783316a15d18a1cc3a6b8666eb7a282270b54e5c8033dc02e39547220534a703a46aa60c702eceaa9c7c5318b2b69f886df4154c06825be3ebe3e9a9751e
+DIST thunderbird-91.3.2-et.xpi 598832 BLAKE2B b4407203bfbcd362f80d1d14bf0891ab7587e613e7f7f0767c1523d1b227e990217d70f810452ffe26c5a69fda7c63bcd607a6785562b521d4b6dfbec4c9706c SHA512 9ab950b3a3238435aa511953ee06a23ed2a4604f4b5d12c7a03734551c98662546dc5fddf7bc93978114a6ff09f213fb7378fc78a1a54de59a9738e50ca76286
+DIST thunderbird-91.3.2-eu.xpi 666124 BLAKE2B 8e544c730262e6060c873522267f79ffc60e04a5d65f40603a11a010a5ef649a516c9be2a0da413dd22c47eb63f50ce72312be4cfd7b857e64564c6b58c7df48 SHA512 e5960720304672ce9189e85117f62b796fba3d79a0198bf8352a6346a5cc3e0a1101f0921cbde1b40794a2fb81a1c7c8b1181c34026b7c427a7efa33cbfcf496
+DIST thunderbird-91.3.2-fi.xpi 664678 BLAKE2B 7574823ecd0f5c073abbf087d48b04533387e1d737c5727af9d353dc7004bc853d16023624da6c72ce1ea16a46e77988d2fd67784924de3e154ad0dcb15828fb SHA512 bd0a08c5524df3899a1ff240d993b3bc081b67afd940d4243c049c27e425f0ece7390388f23420ad01c96826803edb05e091bf0240960099df4358392ac85096
+DIST thunderbird-91.3.2-fr.xpi 697504 BLAKE2B 82613f55810b82533b51f4e4acd63fc571b61fc13b3a11e08ed9d5f21aa5fe24412694a78e21cd002bb8fd16d3722ac85452f8eeeb5d1ac616a93fcf6fded1cd SHA512 aed8f85c941970d0aa83e56d5d32ff9dab5b7027b885b9e388b4f20b40fe7b1ad46120ec2ed27c328d4d13166eacc00aca103a63d530ae7a1191ed97a9d47f4d
+DIST thunderbird-91.3.2-fy-NL.xpi 680172 BLAKE2B 4e40a57d98e38f9ed86faca0be6ad3607923e1596c01fad534cfb4a88c1be3ec5634b699df0513dbccf158a611d52e7bbdd8e5157effc41c2d3bea2068cf88be SHA512 b314051ee38d7b7213b44394db7af9694556a4cb0e6765e9026cb36d275b4a7a0c3d788438ed5695815d5beffdd485cfe42fbc1984b590f8574b77a57cf4fc7b
+DIST thunderbird-91.3.2-ga-IE.xpi 601909 BLAKE2B 18b8637edc6c1559dbb6e9a6c35db726faba3030b17accef1f44b2d4990ff3a126b516ba8b5b4eca7e4c7d7924b607c3077cdab9691e029a866eeac648d876eb SHA512 eca8ff21ca222ae5f9a7aec49a0d1124db4cab6e9a285de35a6efb8de567eb779f03e76ac454d7dc3527f0a8695f339c2dc1626ab41fa305edd789440364bd01
+DIST thunderbird-91.3.2-gd.xpi 635776 BLAKE2B 0c60fc44c291167c5937c19f54e180ea5e1dc256efcf9e1f6e9d7958c6f47881ec6c80a8262b236d2c8c25c05090724a4317a06885926ce304938d844df0cc1d SHA512 5108c9f0c3ca44632024420f23d84a645b67152a905f31428d9eb4fa61cb1a5dd51c64e52070f1103a3f0b7d6be5d62e66774e53f78a6c0f8b4a87b0b73d677c
+DIST thunderbird-91.3.2-gl.xpi 671075 BLAKE2B d41618f40f59bb96245d7137fa57c635a1b98c663a36ecbc0b8d09db3a89a968dd3571fb8923cdc48c1bf1ce6999a18237cf0337e9d1053f307159d69a47c2d0 SHA512 d02a69e163bafbaa437b0319d12aa990328605aade936eb82ff53c4c220c7594e13efc5f91668544fdc0cb05e8b85168e25b566d60f3f8915b6aacca7610b492
+DIST thunderbird-91.3.2-he.xpi 665955 BLAKE2B ccfba17dbb046ba2a41bdbb4b13801ee98aff10b6ef6417928cc6919a49c8b1e0501061714e1bc3bb06bfe783080b87e825d5115bb5a523ff4afc84ff579c63e SHA512 c3e4b2df644ded90b11632bb31760a4c56b225a8872d5cc74584c1690e99c95d17d461a5a16eaf7c12124ee0b7d2af36ed1303a5d9c04666cdac8dbaa8f83537
+DIST thunderbird-91.3.2-hr.xpi 641171 BLAKE2B f12a2853311527ceca3dc56defccf6496b621306058c81555819010b8daddcb417e7c391f690bafeab1de958f1969a65a49cbbb23729515495cf3461d1be4fc2 SHA512 180007026ea04c8128abc5088b8b1ec3a2251892f069c75bf8e5188c8131853f054198786fbbab122c7a99a7eb1604c9a578482ff0c4e2360bc7e5845e1cbcf7
+DIST thunderbird-91.3.2-hsb.xpi 704705 BLAKE2B a40e1b8378b1bf70401604375aa44f58426380d868f21b737b1a8384098c4784f053c82274fa9632b1c71f902e59697b7bb0ca98bf61068406bdd396a3f449f1 SHA512 29ffac8e8d4615bfa8254a9c16e6fa4d9ddbab96430417a090147fc3106fa0510395f7ce745dfd2c9c5942f3e6dde0219ac6b5be88171d8d5c7355b73083c366
+DIST thunderbird-91.3.2-hu.xpi 707540 BLAKE2B 76fc85d7781d0b93c76ce72fa41a54a5e278b572413b0c23539160fc0603c0aace256871abaddad21fcaf89cb925c32e023ea83593d3fee8204b519bcb217359 SHA512 6e1f053bc22e0569faf914d450e2e29b2f4ca772ba9609806288b30ff24c1d738f3671797d564ecf777b27478ab0606d19b42f76fdd1e632b7a78b45b01791e0
+DIST thunderbird-91.3.2-id.xpi 639034 BLAKE2B b20f2f8bf991c430fa0a108983b0204b8ddda8d64d4dab1e629700283eed02f9d03f9626ecf692f468919e6480878c5eddb9b6578d0c73ce166b6ee17210eea0 SHA512 61754ef24f38fbce192d56a5bd6997fdd8e745e66bac367d44cfcd04dad3a905ffa78d1a67e1b6c65d2d4225ac6aba9fc55a76f53920dc3bf97a2d49156ca506
+DIST thunderbird-91.3.2-is.xpi 575006 BLAKE2B c4ea47ba06eb9e60914ba442c650cb679990620ba2e26da1ff008dbd0328f6dd47177d88cac2fd83309e1490507bef9c6a03a0930b40d7c8fa5bcfbf5d823a0a SHA512 82aa5207902de6e707b5eff7cc134c190394de1ffdc697a683b81bec775ff92aaa0bf699a49ced6fe5638097348648bf8fc50435ac2f5dae5ced37ec600b1476
+DIST thunderbird-91.3.2-it.xpi 600160 BLAKE2B 064284f9ba14d573baec489a36a8674e5423c6e5b208ddb5151bb0e0b255c2b4351b0a0d3697988cebd6b77a08d9a2db8e03d6bffdd75400bce22db28b11cde9 SHA512 8ebf1e674e5829b2bc5e0b673ee1f8e784440634afe0c821ce7abccb60a0c702980fa8d8a641f105f087c8156a57c310ef12e8a2513c7cc3a072c46d9337c246
+DIST thunderbird-91.3.2-ja.xpi 741229 BLAKE2B f25417938d405bc339dfa07d0f8a34c862a0ad6ecb2e1886c159eeb39ccd69d556bc01ba97523acc70585d1d36f047dcc670a01f4aaa3f81d23afefc8cfc5fa1 SHA512 25803d3a298530fec752833ad103d0751c9c5b946151a5e070c96638bdd978794bbce32fe8c0cf4aec16c12e8f9e46f4070e807b139e13a4c1cca167a1533263
+DIST thunderbird-91.3.2-ka.xpi 746751 BLAKE2B 816e1f7301ad0b759f2dadc0d2c67ff6843632ae0ed117c7cc5d554fadd8a354b5ec10d0c05f1200a35b5cae495640c2dc0aad5238926aec7255edd29424b330 SHA512 2ae723f19734fae5e2bb74893b4284658f3bbd1089919cb96470409c258c4aa95c85716412a8e2da09e44974a2cabe316c888dd926df79c0f2b6de81fc6a3cf6
+DIST thunderbird-91.3.2-kab.xpi 672040 BLAKE2B 4bf493356a500a641decb6ff2e4da293475837f3c065c9c64be65daf8a89f1f7b85319f3e0046bae33ce8b4700e40e43addf83e2972c52c4184e2c3daf469cc1 SHA512 a9b5bf910d83bb13c8d8417f5749ff0b2360e35d52d3943ad660c3de3c652869d491d1b1d81a0ac86078ccd38c13176221eb729b38adf6a32e9c1ab333b7dab8
+DIST thunderbird-91.3.2-kk.xpi 731346 BLAKE2B 37645d4ee29c815a4ee723f4986200385f48444d0984df9e3695f8265b90f33849e9969e6042390c3bc7b838309a27f1dd06d33200bc725e24ee7af7615aadcf SHA512 47c5f8eee3eaf2035677b252181cf1c7f755b3d804cdf105d09a876798cd6988ac50af21f83c01fd4bce811095e618a297c7c73a2da16fc0a441a331183ee165
+DIST thunderbird-91.3.2-ko.xpi 695482 BLAKE2B 6e9503bc19d2668aa849d5b599f5dde94324d57aba756e3982d13a0233c37f8781704338982f8005377022a8f90bfe24bed1be445b3ec3f3e3980403c0430697 SHA512 c9b51094838ecf071fe866dbcf9b06ea8cf72fa1a5b6dfd58966a6215ad1a44d5f55ac564faaf3fd3c5cdec641eeea51ff9569a413661fcd518f187267baac4e
+DIST thunderbird-91.3.2-lt.xpi 688959 BLAKE2B 1e43f373d9e68fac9913e70821392faa53a9fac11bf30682b2612410e6baa8839a63d508621dee3a1b2143b10e1541f7e0ed7753d00e0ca2b31f97dfce0ceadf SHA512 f20da26920a8e4b13cfc019e955edad6649e0cf95b81a10631c11d8c3f05e3416e5f388ee1054a0f916fba6605834b82a27b013543ec188f7be8ef92946b0837
+DIST thunderbird-91.3.2-lv.xpi 614287 BLAKE2B cb41176e1c2e21e6a2b1de69e0e5d841e9f402f13d94d38d6bbd602acdf9dda17112ae653c161d2479ded1470f20aabea899a412b792ee593a16aca5a28fe82a SHA512 b30a9733d3dfd17abd715f6e5c8428054d029bcd846d9a5d4aa19338c19fcb0735e20c9d39d60eaacbe59b096021d140f63b8ab8494d739b2247846cc38f4b61
+DIST thunderbird-91.3.2-ms.xpi 574046 BLAKE2B acad772cb822e26d4c8a5672e3fc15c3eef538e11ca7bdd11ffb0e000ef05e92334f64d8613c3178ba46c1042f2e83646720fdcde38b3b5c6eae5e01a768deb1 SHA512 e7e2b706a2f5e2c4001ffbf039fa1015b0db8eebd57a007f291cda061a4c43932a7cc9a949f6aa3afa03dfc64d3499fd5722d81c20b7ccbf192cddf0cc1bcca0
+DIST thunderbird-91.3.2-nb-NO.xpi 645840 BLAKE2B 009569ca3d372ba8007a42a02d8481f1b584cd22a358d9055f06ec488f3c5642d7e683b764bed252c06a63da92bbe3fe9158f0c80926c476898441d0edc5e3a3 SHA512 326e7482456d708240bb5d0838778abc220afab7caa281adbaa1d83921143c6ae6b6319ce736e4df4e42d47d1620a1c47e12c89c6ad5e67b3f7c8a17df7430e0
+DIST thunderbird-91.3.2-nl.xpi 671291 BLAKE2B c37ce3120d29e3a3829a54db07eeabf7930bcfa2ec1e06c17c6f36aa77b01ccea1411b1fe786290d9fb126cf694cc15b8cd1fe6461f2e1163b94c183ccebdc6f SHA512 2b4e7ec15314932811b26cc0fc804b84ed8e3684a029c79be4be5a3af65c90d786700560c45355c45632c787cdd85accd617debd1024583fd9b3ccd5c946fe68
+DIST thunderbird-91.3.2-nn-NO.xpi 649226 BLAKE2B 6c29a2a484b026684e590c26b045742d72e3c7d7a82c5452f54014b1542e83de515be2b2c5895046809597b0baa192c2ab75d59d90a340e9baa57d3c4f0f906b SHA512 d869ff911d2ffd23eb9ee2a5e32d9742ee64217561fbbc911366964dee839a39722177a6a7a48888872b21f1eacef58142bda1e02775434d7843bc3ca70a4877
+DIST thunderbird-91.3.2-pa-IN.xpi 647734 BLAKE2B 6e44de327fac80f8164f15ba77e61e2bf0adf340310b82fa9825e1fc2f84d4688144c298e09e3cdeac8474a5c8c6fc38e8854614649661f1b4861a4fd3a4331c SHA512 aecc12d0383a60e658e9ad51762b3b5f5213db1e3700268e458a4f3d91d2fb89d78c5906776334c195874ab79771fc9f0d11f51d70c5ecfe33da826bfa97bf31
+DIST thunderbird-91.3.2-pl.xpi 680304 BLAKE2B 7919a217a943b9cd3b29fe3dcb789439fe702800e5ded99f5728c5b715f4d58b1f14c4e4c1f71e12538d7b2e59b8a4ea1bd10d06d100f18b93e0e45282fca6d6 SHA512 a188e9690ba058bb1c3023ca233e16dcaa71fdd36dc4a29274a2ca39efeab14b83a535b94a64c099265378d006cbeff258a994b354506e805bcfc5fafdac72b0
+DIST thunderbird-91.3.2-pt-BR.xpi 678981 BLAKE2B 9bbd5dfd3a44489e6997e9b49cc72aa8b02fbcb11cc4b51d2429e9cd8268590072ca843a0ed3094fd924334d9452452432423d2b238fe263b2392a7b64a3d181 SHA512 0c56fca765dc6cec7d86d1718da68c161b80e8fe1f5ef80604d5782153414f6a8ea2b9c0eb415d206444ee2f000c811dcd0c4192a8d2c5089262914ce369540a
+DIST thunderbird-91.3.2-pt-PT.xpi 665707 BLAKE2B 54acef3442d9e7b07138a247b3a38929bb0d65522e38f6bb6035aeed1ac5b8ce377c89056f96d2a9ec8547fea67529fe20522317834e329c9a5bf9969e707652 SHA512 bae7f82ac6572248582b87be2403d18f2b0320a0ef7e0451647ba2af3730808ab703552188b12c8d3941cbee49242e5442caef49a25371d0098474ce82e16a72
+DIST thunderbird-91.3.2-rm.xpi 671677 BLAKE2B 086c0e71f50585bccf9a2e163a6d1116d75f08960d7d6179433e9da544f54d111c3b07390b26ca3a5a3f061bcfd709f9065aa5338a070394c5eb0a24af07c39c SHA512 37966ade0ddd611a4584c86e417fd92f0a0139952955df0cf3d421a6128f5914d900b45c52ed6ea2850aff910bc80b322a3acf5f960ac7656e4bb7906a3bf66d
+DIST thunderbird-91.3.2-ro.xpi 656464 BLAKE2B c2168d3a2859bc5736e8ef7d4f34fde6b95f7c845ace11d4a297fb187c3cfc7c37dc806e54cee44bcd164ce6f522e8d0036d7fe44139da62abae918eb738071b SHA512 609b4b19425c6b58117b2dc04b88de7791a9e51e674551de1c3e70fd398ffb0160c8dc13b38a1abe590ff02676eab88c6cfe70850ef658ad427c9591b4e3bbca
+DIST thunderbird-91.3.2-ru.xpi 783358 BLAKE2B 18a6f4c61903b6c3ea36a58a30aedee9db65dce557f130344acaf31643a1e9ad067a1268b45b73742546c503224786b35c9564c543910f4d8d542e5fc3b207e1 SHA512 f96df9a299afca3cf62ca476b3ef844d898dadc36c7cb02978b6004f421d107f6f3710b6b85903049d8b8399f11b215967fa6796d5df075dedd453cd9fedcea7
+DIST thunderbird-91.3.2-sk.xpi 707731 BLAKE2B 8f9242c1c792091c419833569a9bbd5e0271ba98182275efa00f50d33890b0daa7aa2fdfc302961a25a7cd7292ebff6539114e6ccbbea4a6042eb94b934212c4 SHA512 f6f217e285b1681f293034e2836830937e2136f89fee25175781e09d65d65489d68b8bf59338aa31bc4122056bc77e66ee7c387c6977d827ffc4128f2a7d6864
+DIST thunderbird-91.3.2-sl.xpi 660446 BLAKE2B 660cc282735dd0b87e0d474d004514f5ef32f29757ee99130d2103183082f60d56408f40bd8194efa49bc473f375e8c4ce4791fee8c4461cbe67515447697ed3 SHA512 08aa812923eeb087c3af51d0fcba4743f17c8aba0770d3fd75919dc1cb92fc2f496568ccd347c6bc6dffdf0ef1d4821ae91b2b0e3dc5b883213cf921900852ea
+DIST thunderbird-91.3.2-sq.xpi 693388 BLAKE2B af4c67acd2c7b8b0d0aba77fe762025bd05621c4c72cd15168042806cb886a7a63f251531c8b2813e803c9d721932ef6a522a4944e75e7b4d50f3c66efd7c594 SHA512 6a5c51b8bf7986b2d0d47a245f64b05203941193844758a973829c17fa2882ced83d97b3de6b1fc876180bff2f9dd0f087ae3b11e045c47e81bc2e67b5f86dfd
+DIST thunderbird-91.3.2-sr.xpi 703326 BLAKE2B ed6beaa710835bdfb5711ad011f32ce9ebba3f46990e11a87c40a783a24a1120041cd1f8d37f844e50c0b4686e7b2f58c7143d0c0317d8cc98fc063cc34fc3ab SHA512 87ba1b687dea40a154aec863934258c0810c2ed8556a9539cce2341e9d17ae7fab9805d230201d62c62648e062f453ce24b3591e1106496d4a198df898f9e3c9
+DIST thunderbird-91.3.2-sv-SE.xpi 675811 BLAKE2B e5d2aef26c8d182724e096bc1b524cb074e46e8a9ef6f5fec7a462da439b81ac9c7e8185ef1c526948cc43bf4ae62dce7c508117ca923be5dbdeabf422094b39 SHA512 696a35a6734bd3bc782d8f7eb21d0081aa11609a48a57fbd66445b617d159945e96b1de21dc7bb84294dd0464c19c8c04a401db7ae14024ccf1b9003491a18ed
+DIST thunderbird-91.3.2-th.xpi 741242 BLAKE2B 491c71f031911c844c3b04c4d992e0196d4e068e59279b97a27075844ac493de7be2d6e2c37dbd2828ef07a1b749e314375c82992eaec3e6f79a8706f749ec6a SHA512 e2e5a1d32250934db0b2ac8312f0da1830f7830f4ed60179a11cd01429f4bdd21d2ecc3ac3184a0d57e485fe6aa47a9853a215acda0335046108edce4753bf6b
+DIST thunderbird-91.3.2-tr.xpi 685072 BLAKE2B 7c0b8d274a85357227dffd2cfba5c55d5f779d78abeb98e88f60045283c093daee89f718ac43a1c945a101c683e4daa4046ef273b503ca11df0ebe839fda7a7f SHA512 5d2121b964049d19dac24e12913d99d027733a64971a23daa7c7a397b5ea2c6e3395bca297e94438b4401000ce71a89ab56a05ff37f85dd5f3020bb8be32490c
+DIST thunderbird-91.3.2-uk.xpi 780970 BLAKE2B c5d8fcd5b4d9649c4b1106ac74eb08d416132a5a74583a050d4ca2ddb2fac9f513dc7ff7672179788d5403f3b645da3a1ff13687a6ef9705cd6bab7391e469b6 SHA512 54834e5ca88f6e77185352c9592a37ba539788a179eaa8690b17d04f6cc2d78d685253affc3f5042952a76574bc2946155d0d964f30b46e3cffdc8e84e9c9760
+DIST thunderbird-91.3.2-uz.xpi 588119 BLAKE2B df1a76076bdeebacf886b59ca850a4e3df200583d5912609741d0528c76cee61cb10ba9ec13faa2a5b828d0c186b9efa451aef3baee26e4867e5b54e0b55c361 SHA512 fb94400618a9839053902c39a62924000cf228969881d7868a3b2a59613eea752af9d2c0664231e5cd7869ac159e412da5cc304da4d82ff7f5ff314af8a14cd8
+DIST thunderbird-91.3.2-vi.xpi 706359 BLAKE2B 6dfba5be7833c2e3058e2698971212480d7173e4d93f4e87d01bd5cd347eba49ec16863b53bdb73a464fd8d82db552366fcbbf8a5eaeed2b7d7649ed0a1f71c4 SHA512 e01b7e442ce2bdd00bc225dbe3fa1aa4b12e04b629e6996c7fbba3198dcd9460a84f869f1f4f43353ad31ad9c3b4a4435933ba1fec8db9b7d1f6364c838e62af
+DIST thunderbird-91.3.2-zh-CN.xpi 714607 BLAKE2B 2ff1e8d346dcfeb7b5f69e49f98532c0f7ede33cce59ae9a17a9e7490be4641c78b23e0ce2bd6c9cf78bd4b81792d84625fbd45ab285dc485fb6896afc60b412 SHA512 9e5556afb814df13e67203742ba9faa5befe1d72d4fd4eb417d6c4f97500a258260c8e9d3e9fe11e527c572326deab643d3e94fe9a9cc09736b5496062c5b055
+DIST thunderbird-91.3.2-zh-TW.xpi 715955 BLAKE2B c03f07d9b7ac5deffc5bd55c6bbe29a9d6e954b0b3e7ab9cd76f370c73341cbebc9761f259e1b38569a48a5cf91bec7113462ed70019ae5eec3e8de897e4e97f SHA512 66f6909b3cadd6e560b3cdec8654bcbfb65f84b81a3c96d6a13aa0e75f166c4dbb744131d525c31f3b09c10c73884e72f0d4aeb2ea574c3f41229bed16b69e77
 DIST thunderbird-bin_i686-78.13.0.tar.bz2 68397500 BLAKE2B e75d9f5cb690141eb4015522f462151d97dae5318c66babed7d66ad7b4f5a1d3213ae8872ae4d12d06e8b13c1f3a4d5e765f3cbaf613cf9a566d3cf7a0f9b3bd SHA512 a45b44029729861a86e2fb3c3297daa0757af0bd23c83dbd2609ba042c5f8976de350001b0d8b0b0ebb8d5c0e39b4ad02a24e893b3b81308feeb34fd5c5f1507
 DIST thunderbird-bin_i686-78.14.0.tar.bz2 68396105 BLAKE2B a67b59325664261760d9fc0442ea5e4f968ec3986885a6377d701b2900888cf26556000c62fbc1b36ee0f0b82f5597d278fa2d6ed0e982c9f28cacb4e8c281df SHA512 fc63ee8f542fc04b0eccffa0a4e59d7edff1a2c635de4aefb4f2ac3bbe81bb72c875adeed28a802bf152ad63dec0184d77ce1b0dcb9bb8210529256a43db34c1
 DIST thunderbird-bin_i686-91.3.0.tar.bz2 75288674 BLAKE2B 74be68f9920d618f07d03e2bb7f5b02b3bea61c2cb2ba1052f44414df41f40d520b41b60f1681eb3a486197fd888e454aec6ebde903da57c6dc9802040ca6bd8 SHA512 031c173f0bc84e3be4738daf815a7e53fa2422a0330642b164cd6dd55dced2efa1ce8f1fddf9c8dcb207ba914925072514e9b1984ebe2f13606e8d0318e73bf0
 DIST thunderbird-bin_i686-91.3.1.tar.bz2 75320339 BLAKE2B ac3a60ff28c0edd6017524cabf1d3c714d3fcc93487f340518e0314f32a07e33b4cacae6c7716197e1f9f22f4b34e384e0a54a8791b855f94225ee9020c12003 SHA512 deefbc1d8bd147293abe0136d4403732acddec0b8deae1e6564bc1965e17a7198ac5cc5ecf1e007d24051cd1213abba0f2a10c49a7c0689c8f73dd86e3063b8c
+DIST thunderbird-bin_i686-91.3.2.tar.bz2 75258563 BLAKE2B dbc516d4099bd8eba8ca81c9b13276422e8c24b5f15fd85d2305aebbcacdc53cba987669e809b2a6a853e354d64edb378c8b3a50900e2b3a5700f0d319c2f552 SHA512 aa3b895eea5d2ace346ac1c94a596e1434b01ae9e98a9da6f67b46f356298161957532cd4f15f2cb078390af2a6ec5f6b79db57c2afa1bc740ea90b57b772ac3
 DIST thunderbird-bin_x86_64-78.13.0.tar.bz2 65365040 BLAKE2B a47b437352b5660e81f7c05f73e0399bb0f0e75de17f212133c13d78749bbc63d610bda5c1cfd6de154d1a0de65b4746f3a974046fdc1b737cfbe87952433312 SHA512 d74f99ae495f574405d782eed476a60c5c0464fabfb3dd3cd5d1b1b625a982919ff77704e656a119f4d422ad27f7ab738ab93d3e53596879c2dac3a37b25f5c8
 DIST thunderbird-bin_x86_64-78.14.0.tar.bz2 65341691 BLAKE2B 6382846c8e5e8dff2f00d7a9f739d9297237e4d93ca7b444fb41138b57598b1e19315af0a530347dab78ae68b4006ced42817f8b0bea15d6d7e6d74a9689340c SHA512 c31ad9024134c79b35b5328fbb70c1a7cd4ff1a9688e453f138f2991ba0592f6237a52dbd011d5bbe3e3d08d8e3a5000d33ba343e6f57a723f7c39d5c1f6b938
 DIST thunderbird-bin_x86_64-91.3.0.tar.bz2 72030274 BLAKE2B 016319a932eff93c259a904f481aad0d30739055563f862c5ae342f33bdefba664b93a0ed8376a3b309f2a9455b5b5d033b533edcf0664ce84ad9e8021f08d45 SHA512 9cbfcd93e58dcd17333783fc880ed3799aec0c04285b630f395e3f9bc793cd6c37b02e2c68792a458b90b3561c223b163552221b58fb1cdddf1d4e8dffbc2532
 DIST thunderbird-bin_x86_64-91.3.1.tar.bz2 72075644 BLAKE2B c53e24cba664846c26a212c98fafdce52f4e37a68d8b8b7a114cd4aabd234bc45af58f1f12a352ffba00c3513010cbb44683ae4a172e92a2f8b1a37105349471 SHA512 9c2dfcf084621b7fbac9339aea6035c794b8d27219fbdf8613a6cafeff3b7224febdad264bf418b94b3fb9ba92fc23c98b003c60a2dd8ff80af75cc810eb6476
+DIST thunderbird-bin_x86_64-91.3.2.tar.bz2 72098566 BLAKE2B e6963f3b517fcf30a4a0bce5392fba93bd49e96dfffcb6121dd4ca5ec6d2fe013088af0a16e9dc5d2d161d856a999a2a173e180b2e4e46fd5d8dfcde78c8fde8 SHA512 d6f4620d488dbe12bccd8af4df840f1a7e220334115b32dfd131fa1c19f465f1ce0cc484d9e38c72a6d02af4ca3f05895f8a0cbd6373900225477a5b70eaa854
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-91.3.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-91.3.2.ebuild
new file mode 100644
index 000000000000..139825d22d75
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-91.3.2.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index f00c04963279..1a9f1f9f17cf 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -259,3 +259,67 @@ DIST thunderbird-91.3.1-vi.xpi 706358 BLAKE2B 7cfdb545b0c532f9077d7266e443e4692c
 DIST thunderbird-91.3.1-zh-CN.xpi 714607 BLAKE2B c9edc522533149bb7ae3e753daa15b77581c67d2c2372b783ac86489c98d5fb1b167982f94ce7d535a2a9b8b47c3a1a1cd62ece804c708ba926dc05d245f5401 SHA512 66556244cbf6e700dcbba0b61d0561ed848941e9e929e37e96c47060ce8c98ec3ff064d7e1c95082fa2b6e6e9e29b8f9a93eab7623b4ca62d1b4a84c877585a6
 DIST thunderbird-91.3.1-zh-TW.xpi 715955 BLAKE2B 1e8d785f749cc9825989992ff8e8ba4f2094742c383dab5bd3638c4af34d3d4b85eeb23bed98cf8c030b24e25115fa6de87db5439a5cd0663f41fb19df465620 SHA512 87610a5e557a04b3e0bb0fdc1970fa294681d0f7607b46228980be56e7737698e3edad46647c8b7be67d22d7c3033bff5d6d7dab6ae8fea2284ccbb0f5516b93
 DIST thunderbird-91.3.1.source.tar.xz 403764984 BLAKE2B 55dc404797f3ed4065d14d1b9360218c2f24dd9bd22472446a2bb755de68495d974e1bb647caef8cf9a27af0e96ba53cf57504fe0332d23ba76e9230b3e2dd3c SHA512 4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b
+DIST thunderbird-91.3.2-af.xpi 560247 BLAKE2B 38c67858d7d20b7ef3c0148b13b261e47dbcac6b58c4cbae03abcbc8a12f60cc06632df26b99db499dc5581fda11fe94599904dec291bfc196a9e375049df07a SHA512 19352b7210a0edf2770a3d174fac12be53719e82adc42911e37736bdb8f9f5d5320dad1f583c79bbf067a2aa21e2d8f8152db8aef91406e571e6f709c569a781
+DIST thunderbird-91.3.2-ar.xpi 660313 BLAKE2B e0c82ea24c98978341366cddf3a65fcd0e80e369fffe86e83b9bf66fd39a0c876865abbd9b56fa3b7b729aabef14e6d24de7a63b23e5b7909479781058de497f SHA512 61555c72082338f7b1550a76809577edf0f3df67aa3c5fc66ba8cbca95272ff9cb15e70bc7e846936038fd7939460cb7dcda63878fbdca2ce44dd9a848ef5c78
+DIST thunderbird-91.3.2-ast.xpi 577052 BLAKE2B 079ebab5eb77843bb4d3139080af7f9845afa74be48258af92b6c7c191957f97df40e577f83fa8a8c2f93269e322eb4de44057be0db58007428e83a2723418d6 SHA512 b05517ca2ff26b308c78e7e601533464fb8b1816b081553a99bc0daf9393af39ffe68a16bc28fc2b9ab6200ab81b889ba9005b500bd0258aa9ab7f4dcacc6f48
+DIST thunderbird-91.3.2-be.xpi 687227 BLAKE2B c2bfd7388282ba3098a36628b7841dd61a20877014df538539dcd29269386b98775e570ad1b5ea3e7bca79c19afa9cd1e2e886cbef878e72e7463a18ff3832ff SHA512 1ac362e2e581c92f8ba1d68e6a1aea35c5a2450bcf46d60ed6e9a24aa602fca60f8a474ca995f0a740f0315bd5c1594006a67df9fd52f039fa7733e2d4ea06ad
+DIST thunderbird-91.3.2-bg.xpi 686416 BLAKE2B 4c6d176964274acac85d3d79661744dcaeab77f4f1c2b94e7dfb9e1addb28b7d3d219897026ed568184fccb85fb2779da944d26c3399ac86ab74f0bbadfa316d SHA512 56dd370da78e783dd1cfafb5b7f3e32ac1dd23967dcea9d257aa5132334e29967e69de96a30fda4d71aa3d4abf6179824ca3a10641e284002c158001ceb2fa08
+DIST thunderbird-91.3.2-br.xpi 616018 BLAKE2B ff4413e928389f1467ce172a99bbf98028cbc8ada135191992751ac79dfe09b1ca7b7ab99dd5d0eb42e8ecd9ba3acc5d9c6a11a591482c689a2eec55a21e09ca SHA512 37526df45b3db0aba6016fa681eb01b294493c2c937a4923d63fbc8f0bcf7840623e24eda5e48784e4d7b8414cd7a52b69ce4934bb9dc218187335789e681bde
+DIST thunderbird-91.3.2-ca.xpi 641158 BLAKE2B cb34a99bc522dc8f183f18a22d1d8feebfb9d4ada3e815a75e0daca88449c93733f9896028017bf9259de3fe726edcf030df0e4fa51f51ba5c5d9d2956e7521b SHA512 290af4ab5e14d3dff3738049af519896ce0b75a173b4d3b9558405bd5c79b0b4a6dc6af4ecffd7eaceb28882a511a1cd6a33c5a118959617289f8c2878045295
+DIST thunderbird-91.3.2-cak.xpi 647217 BLAKE2B 1d18eb059f934c8287530c4c39fe23754e39985e652c2e00255e6eaf2bcff590e27c3f0bcb16aa1b2e42207eec3cd04cd99b67efc4db380f0259c1f03b5d6aac SHA512 8c9219ae0580cff202cd368fb1cc006eac1cf41ea38ab1cdeaf6db54469281051f695bfc24e466a70cb7f7d8f3ca53bf436ad9d721831aa0ab9bc7666e39a269
+DIST thunderbird-91.3.2-cs.xpi 698287 BLAKE2B 7a80b95fc48c1efdc649f375f8e67ba6128fbc056638c3db45665752c4289cb3be10b15436aa65f280a58033532a85fba7f4473c6a3d17302c02a6a2c96542da SHA512 f29f45956775496a2b8c50442155ac16aa58389d558c75b38e186f7d46a9aca60c38e8626e05bda09c16fb5be40342d5479f55ff797bbe13e067f0eb6845a1c1
+DIST thunderbird-91.3.2-cy.xpi 673997 BLAKE2B e732eaa0f9b662ecd08e079b25970a72a153d0020915d26644d75eb3b97608dec918e0bc85c595067da70910725cf3f82e886781db1b71a209c1302a470c260c SHA512 d06281cffaaa38e3c1e3192c38b26c875cb2d032821bf5f0889ffce462dc6df5ca7027b2a145a0eae3bb957451640e9f385fbba4af497fe35c55a647596bed8f
+DIST thunderbird-91.3.2-da.xpi 655951 BLAKE2B f6417f8523ceec63f56d2113171be49fc984deb6f833ef8bfae35e7fec47170d801c1b1039392dfb4d8d25e41eeb576af9f1d11f37ecb30c833c00f99fc99978 SHA512 e5e19c0d02ae421aed818e55760883e43a30084e219df81dc68b25f2560843da1531b0c0cf011af7e4dfd35e921485c3305078545e1d96c22683dffc7cdf6e9b
+DIST thunderbird-91.3.2-de.xpi 687003 BLAKE2B ae3aea3630d4d53d100ee58e85fd64d2622e9dcf91bab240608a71a8d50ee80c8d2f0cba9b0e47b0519b982690daf6c09980d2c66da47f179730ee9013da9151 SHA512 5f55286aaa5f86d010caa3cc3e66bd574b715eb63a6189ed25cb4bd6205f519ad974f0b5185a0787e000a3e7cb1afc3c4efde908cf2d8ec78c0ba74e5bd16b05
+DIST thunderbird-91.3.2-dsb.xpi 707237 BLAKE2B 408e1e2659f1adf6a7473aa9039e983bf76d887b1ceb4499a09839cee0f870632bee34bee5784351ac317466f54f140400ee864125ab9636dc09f8275417c89e SHA512 5713163c6f9cb6eaf06e7b1ee2ecbf5dce9adfa905bf672db77d89859d9a1a9ca780d699921f64d298b8844c4c51890694460303f2dcb148fd1d2f290961b08a
+DIST thunderbird-91.3.2-el.xpi 803551 BLAKE2B 3c087b5fbb72d0552c80fda9d2a9e0534f4453ca2680eb6e5a9ee63a2993c4a965471319bcc78b92e8004ae5fe48b9975d1e39cb68a9dfa748ef59d12d131d8d SHA512 9b7fe4a982d7c659eff134f8f77a4a6c342aeeab4211ee680dd46f967e27edc2965a949d2faa5e5c56a98bc6d50ce8307a4cce0e8a41760c856557729503c756
+DIST thunderbird-91.3.2-en-CA.xpi 634128 BLAKE2B db114f45dc2f39a844d6ee91ef66f442dd7ea85a431d7fbd1db16ef13f7ce0745fc6384e860b9efe3bf8b387abfc5856f4d00fe48e2b4524d305631c1194a382 SHA512 748164d529f6cc3ef998cd1fe8b26f3e6d36298b02d2d988572135f7cdee781daf2857bc772cec726a4a79cc82fbc25fe61f70cf0c4ee1d35d50da6ccde22158
+DIST thunderbird-91.3.2-en-GB.xpi 636515 BLAKE2B 7718d5e0045fe393ea56cf759da60f3ebc603ecf1ced736d53035a6fe95599994ec9bb0b60e6d14740b362b5be2f7241b9207483df9cdec430c4a446e00576a7 SHA512 ceff847838893ae23c088213a5454f70ccba8a84763be57d63de6f52e98dcb15b82f9f13b24fa09cb3341560e2a450467db13fb3f4aff6f399d8cda05c34a270
+DIST thunderbird-91.3.2-es-AR.xpi 685105 BLAKE2B e35fc668ba7105107fd1a7e7bf57a24f73d7f018efa8304e882f60d455a010c4a6b36e4d4c3c1b8a8c9e9f0b82db0df307831a655d183fc8d122d6d1d07c8de0 SHA512 2a414d9365bacb223ca84c0fd83d86bcb17d39563adcd61244170919ec873b257f3e8a88d128a0d5cd54eca94c705e1b7633d538e552b7dc0638f99c0bf54339
+DIST thunderbird-91.3.2-es-ES.xpi 573862 BLAKE2B d295efe75600f921f489a745e7ec9507427fab5b2dd72576bf3a72133ad05090d865d6d7acbf14df5e670369f69b5db46f29ed43a9e0372d0e34f149c54b334e SHA512 226d783316a15d18a1cc3a6b8666eb7a282270b54e5c8033dc02e39547220534a703a46aa60c702eceaa9c7c5318b2b69f886df4154c06825be3ebe3e9a9751e
+DIST thunderbird-91.3.2-et.xpi 598832 BLAKE2B b4407203bfbcd362f80d1d14bf0891ab7587e613e7f7f0767c1523d1b227e990217d70f810452ffe26c5a69fda7c63bcd607a6785562b521d4b6dfbec4c9706c SHA512 9ab950b3a3238435aa511953ee06a23ed2a4604f4b5d12c7a03734551c98662546dc5fddf7bc93978114a6ff09f213fb7378fc78a1a54de59a9738e50ca76286
+DIST thunderbird-91.3.2-eu.xpi 666124 BLAKE2B 8e544c730262e6060c873522267f79ffc60e04a5d65f40603a11a010a5ef649a516c9be2a0da413dd22c47eb63f50ce72312be4cfd7b857e64564c6b58c7df48 SHA512 e5960720304672ce9189e85117f62b796fba3d79a0198bf8352a6346a5cc3e0a1101f0921cbde1b40794a2fb81a1c7c8b1181c34026b7c427a7efa33cbfcf496
+DIST thunderbird-91.3.2-fi.xpi 664678 BLAKE2B 7574823ecd0f5c073abbf087d48b04533387e1d737c5727af9d353dc7004bc853d16023624da6c72ce1ea16a46e77988d2fd67784924de3e154ad0dcb15828fb SHA512 bd0a08c5524df3899a1ff240d993b3bc081b67afd940d4243c049c27e425f0ece7390388f23420ad01c96826803edb05e091bf0240960099df4358392ac85096
+DIST thunderbird-91.3.2-fr.xpi 697504 BLAKE2B 82613f55810b82533b51f4e4acd63fc571b61fc13b3a11e08ed9d5f21aa5fe24412694a78e21cd002bb8fd16d3722ac85452f8eeeb5d1ac616a93fcf6fded1cd SHA512 aed8f85c941970d0aa83e56d5d32ff9dab5b7027b885b9e388b4f20b40fe7b1ad46120ec2ed27c328d4d13166eacc00aca103a63d530ae7a1191ed97a9d47f4d
+DIST thunderbird-91.3.2-fy-NL.xpi 680172 BLAKE2B 4e40a57d98e38f9ed86faca0be6ad3607923e1596c01fad534cfb4a88c1be3ec5634b699df0513dbccf158a611d52e7bbdd8e5157effc41c2d3bea2068cf88be SHA512 b314051ee38d7b7213b44394db7af9694556a4cb0e6765e9026cb36d275b4a7a0c3d788438ed5695815d5beffdd485cfe42fbc1984b590f8574b77a57cf4fc7b
+DIST thunderbird-91.3.2-ga-IE.xpi 601909 BLAKE2B 18b8637edc6c1559dbb6e9a6c35db726faba3030b17accef1f44b2d4990ff3a126b516ba8b5b4eca7e4c7d7924b607c3077cdab9691e029a866eeac648d876eb SHA512 eca8ff21ca222ae5f9a7aec49a0d1124db4cab6e9a285de35a6efb8de567eb779f03e76ac454d7dc3527f0a8695f339c2dc1626ab41fa305edd789440364bd01
+DIST thunderbird-91.3.2-gd.xpi 635776 BLAKE2B 0c60fc44c291167c5937c19f54e180ea5e1dc256efcf9e1f6e9d7958c6f47881ec6c80a8262b236d2c8c25c05090724a4317a06885926ce304938d844df0cc1d SHA512 5108c9f0c3ca44632024420f23d84a645b67152a905f31428d9eb4fa61cb1a5dd51c64e52070f1103a3f0b7d6be5d62e66774e53f78a6c0f8b4a87b0b73d677c
+DIST thunderbird-91.3.2-gl.xpi 671075 BLAKE2B d41618f40f59bb96245d7137fa57c635a1b98c663a36ecbc0b8d09db3a89a968dd3571fb8923cdc48c1bf1ce6999a18237cf0337e9d1053f307159d69a47c2d0 SHA512 d02a69e163bafbaa437b0319d12aa990328605aade936eb82ff53c4c220c7594e13efc5f91668544fdc0cb05e8b85168e25b566d60f3f8915b6aacca7610b492
+DIST thunderbird-91.3.2-he.xpi 665955 BLAKE2B ccfba17dbb046ba2a41bdbb4b13801ee98aff10b6ef6417928cc6919a49c8b1e0501061714e1bc3bb06bfe783080b87e825d5115bb5a523ff4afc84ff579c63e SHA512 c3e4b2df644ded90b11632bb31760a4c56b225a8872d5cc74584c1690e99c95d17d461a5a16eaf7c12124ee0b7d2af36ed1303a5d9c04666cdac8dbaa8f83537
+DIST thunderbird-91.3.2-hr.xpi 641171 BLAKE2B f12a2853311527ceca3dc56defccf6496b621306058c81555819010b8daddcb417e7c391f690bafeab1de958f1969a65a49cbbb23729515495cf3461d1be4fc2 SHA512 180007026ea04c8128abc5088b8b1ec3a2251892f069c75bf8e5188c8131853f054198786fbbab122c7a99a7eb1604c9a578482ff0c4e2360bc7e5845e1cbcf7
+DIST thunderbird-91.3.2-hsb.xpi 704705 BLAKE2B a40e1b8378b1bf70401604375aa44f58426380d868f21b737b1a8384098c4784f053c82274fa9632b1c71f902e59697b7bb0ca98bf61068406bdd396a3f449f1 SHA512 29ffac8e8d4615bfa8254a9c16e6fa4d9ddbab96430417a090147fc3106fa0510395f7ce745dfd2c9c5942f3e6dde0219ac6b5be88171d8d5c7355b73083c366
+DIST thunderbird-91.3.2-hu.xpi 707540 BLAKE2B 76fc85d7781d0b93c76ce72fa41a54a5e278b572413b0c23539160fc0603c0aace256871abaddad21fcaf89cb925c32e023ea83593d3fee8204b519bcb217359 SHA512 6e1f053bc22e0569faf914d450e2e29b2f4ca772ba9609806288b30ff24c1d738f3671797d564ecf777b27478ab0606d19b42f76fdd1e632b7a78b45b01791e0
+DIST thunderbird-91.3.2-id.xpi 639034 BLAKE2B b20f2f8bf991c430fa0a108983b0204b8ddda8d64d4dab1e629700283eed02f9d03f9626ecf692f468919e6480878c5eddb9b6578d0c73ce166b6ee17210eea0 SHA512 61754ef24f38fbce192d56a5bd6997fdd8e745e66bac367d44cfcd04dad3a905ffa78d1a67e1b6c65d2d4225ac6aba9fc55a76f53920dc3bf97a2d49156ca506
+DIST thunderbird-91.3.2-is.xpi 575006 BLAKE2B c4ea47ba06eb9e60914ba442c650cb679990620ba2e26da1ff008dbd0328f6dd47177d88cac2fd83309e1490507bef9c6a03a0930b40d7c8fa5bcfbf5d823a0a SHA512 82aa5207902de6e707b5eff7cc134c190394de1ffdc697a683b81bec775ff92aaa0bf699a49ced6fe5638097348648bf8fc50435ac2f5dae5ced37ec600b1476
+DIST thunderbird-91.3.2-it.xpi 600160 BLAKE2B 064284f9ba14d573baec489a36a8674e5423c6e5b208ddb5151bb0e0b255c2b4351b0a0d3697988cebd6b77a08d9a2db8e03d6bffdd75400bce22db28b11cde9 SHA512 8ebf1e674e5829b2bc5e0b673ee1f8e784440634afe0c821ce7abccb60a0c702980fa8d8a641f105f087c8156a57c310ef12e8a2513c7cc3a072c46d9337c246
+DIST thunderbird-91.3.2-ja.xpi 741229 BLAKE2B f25417938d405bc339dfa07d0f8a34c862a0ad6ecb2e1886c159eeb39ccd69d556bc01ba97523acc70585d1d36f047dcc670a01f4aaa3f81d23afefc8cfc5fa1 SHA512 25803d3a298530fec752833ad103d0751c9c5b946151a5e070c96638bdd978794bbce32fe8c0cf4aec16c12e8f9e46f4070e807b139e13a4c1cca167a1533263
+DIST thunderbird-91.3.2-ka.xpi 746751 BLAKE2B 816e1f7301ad0b759f2dadc0d2c67ff6843632ae0ed117c7cc5d554fadd8a354b5ec10d0c05f1200a35b5cae495640c2dc0aad5238926aec7255edd29424b330 SHA512 2ae723f19734fae5e2bb74893b4284658f3bbd1089919cb96470409c258c4aa95c85716412a8e2da09e44974a2cabe316c888dd926df79c0f2b6de81fc6a3cf6
+DIST thunderbird-91.3.2-kab.xpi 672040 BLAKE2B 4bf493356a500a641decb6ff2e4da293475837f3c065c9c64be65daf8a89f1f7b85319f3e0046bae33ce8b4700e40e43addf83e2972c52c4184e2c3daf469cc1 SHA512 a9b5bf910d83bb13c8d8417f5749ff0b2360e35d52d3943ad660c3de3c652869d491d1b1d81a0ac86078ccd38c13176221eb729b38adf6a32e9c1ab333b7dab8
+DIST thunderbird-91.3.2-kk.xpi 731346 BLAKE2B 37645d4ee29c815a4ee723f4986200385f48444d0984df9e3695f8265b90f33849e9969e6042390c3bc7b838309a27f1dd06d33200bc725e24ee7af7615aadcf SHA512 47c5f8eee3eaf2035677b252181cf1c7f755b3d804cdf105d09a876798cd6988ac50af21f83c01fd4bce811095e618a297c7c73a2da16fc0a441a331183ee165
+DIST thunderbird-91.3.2-ko.xpi 695482 BLAKE2B 6e9503bc19d2668aa849d5b599f5dde94324d57aba756e3982d13a0233c37f8781704338982f8005377022a8f90bfe24bed1be445b3ec3f3e3980403c0430697 SHA512 c9b51094838ecf071fe866dbcf9b06ea8cf72fa1a5b6dfd58966a6215ad1a44d5f55ac564faaf3fd3c5cdec641eeea51ff9569a413661fcd518f187267baac4e
+DIST thunderbird-91.3.2-lt.xpi 688959 BLAKE2B 1e43f373d9e68fac9913e70821392faa53a9fac11bf30682b2612410e6baa8839a63d508621dee3a1b2143b10e1541f7e0ed7753d00e0ca2b31f97dfce0ceadf SHA512 f20da26920a8e4b13cfc019e955edad6649e0cf95b81a10631c11d8c3f05e3416e5f388ee1054a0f916fba6605834b82a27b013543ec188f7be8ef92946b0837
+DIST thunderbird-91.3.2-lv.xpi 614287 BLAKE2B cb41176e1c2e21e6a2b1de69e0e5d841e9f402f13d94d38d6bbd602acdf9dda17112ae653c161d2479ded1470f20aabea899a412b792ee593a16aca5a28fe82a SHA512 b30a9733d3dfd17abd715f6e5c8428054d029bcd846d9a5d4aa19338c19fcb0735e20c9d39d60eaacbe59b096021d140f63b8ab8494d739b2247846cc38f4b61
+DIST thunderbird-91.3.2-ms.xpi 574046 BLAKE2B acad772cb822e26d4c8a5672e3fc15c3eef538e11ca7bdd11ffb0e000ef05e92334f64d8613c3178ba46c1042f2e83646720fdcde38b3b5c6eae5e01a768deb1 SHA512 e7e2b706a2f5e2c4001ffbf039fa1015b0db8eebd57a007f291cda061a4c43932a7cc9a949f6aa3afa03dfc64d3499fd5722d81c20b7ccbf192cddf0cc1bcca0
+DIST thunderbird-91.3.2-nb-NO.xpi 645840 BLAKE2B 009569ca3d372ba8007a42a02d8481f1b584cd22a358d9055f06ec488f3c5642d7e683b764bed252c06a63da92bbe3fe9158f0c80926c476898441d0edc5e3a3 SHA512 326e7482456d708240bb5d0838778abc220afab7caa281adbaa1d83921143c6ae6b6319ce736e4df4e42d47d1620a1c47e12c89c6ad5e67b3f7c8a17df7430e0
+DIST thunderbird-91.3.2-nl.xpi 671291 BLAKE2B c37ce3120d29e3a3829a54db07eeabf7930bcfa2ec1e06c17c6f36aa77b01ccea1411b1fe786290d9fb126cf694cc15b8cd1fe6461f2e1163b94c183ccebdc6f SHA512 2b4e7ec15314932811b26cc0fc804b84ed8e3684a029c79be4be5a3af65c90d786700560c45355c45632c787cdd85accd617debd1024583fd9b3ccd5c946fe68
+DIST thunderbird-91.3.2-nn-NO.xpi 649226 BLAKE2B 6c29a2a484b026684e590c26b045742d72e3c7d7a82c5452f54014b1542e83de515be2b2c5895046809597b0baa192c2ab75d59d90a340e9baa57d3c4f0f906b SHA512 d869ff911d2ffd23eb9ee2a5e32d9742ee64217561fbbc911366964dee839a39722177a6a7a48888872b21f1eacef58142bda1e02775434d7843bc3ca70a4877
+DIST thunderbird-91.3.2-pa-IN.xpi 647734 BLAKE2B 6e44de327fac80f8164f15ba77e61e2bf0adf340310b82fa9825e1fc2f84d4688144c298e09e3cdeac8474a5c8c6fc38e8854614649661f1b4861a4fd3a4331c SHA512 aecc12d0383a60e658e9ad51762b3b5f5213db1e3700268e458a4f3d91d2fb89d78c5906776334c195874ab79771fc9f0d11f51d70c5ecfe33da826bfa97bf31
+DIST thunderbird-91.3.2-pl.xpi 680304 BLAKE2B 7919a217a943b9cd3b29fe3dcb789439fe702800e5ded99f5728c5b715f4d58b1f14c4e4c1f71e12538d7b2e59b8a4ea1bd10d06d100f18b93e0e45282fca6d6 SHA512 a188e9690ba058bb1c3023ca233e16dcaa71fdd36dc4a29274a2ca39efeab14b83a535b94a64c099265378d006cbeff258a994b354506e805bcfc5fafdac72b0
+DIST thunderbird-91.3.2-pt-BR.xpi 678981 BLAKE2B 9bbd5dfd3a44489e6997e9b49cc72aa8b02fbcb11cc4b51d2429e9cd8268590072ca843a0ed3094fd924334d9452452432423d2b238fe263b2392a7b64a3d181 SHA512 0c56fca765dc6cec7d86d1718da68c161b80e8fe1f5ef80604d5782153414f6a8ea2b9c0eb415d206444ee2f000c811dcd0c4192a8d2c5089262914ce369540a
+DIST thunderbird-91.3.2-pt-PT.xpi 665707 BLAKE2B 54acef3442d9e7b07138a247b3a38929bb0d65522e38f6bb6035aeed1ac5b8ce377c89056f96d2a9ec8547fea67529fe20522317834e329c9a5bf9969e707652 SHA512 bae7f82ac6572248582b87be2403d18f2b0320a0ef7e0451647ba2af3730808ab703552188b12c8d3941cbee49242e5442caef49a25371d0098474ce82e16a72
+DIST thunderbird-91.3.2-rm.xpi 671677 BLAKE2B 086c0e71f50585bccf9a2e163a6d1116d75f08960d7d6179433e9da544f54d111c3b07390b26ca3a5a3f061bcfd709f9065aa5338a070394c5eb0a24af07c39c SHA512 37966ade0ddd611a4584c86e417fd92f0a0139952955df0cf3d421a6128f5914d900b45c52ed6ea2850aff910bc80b322a3acf5f960ac7656e4bb7906a3bf66d
+DIST thunderbird-91.3.2-ro.xpi 656464 BLAKE2B c2168d3a2859bc5736e8ef7d4f34fde6b95f7c845ace11d4a297fb187c3cfc7c37dc806e54cee44bcd164ce6f522e8d0036d7fe44139da62abae918eb738071b SHA512 609b4b19425c6b58117b2dc04b88de7791a9e51e674551de1c3e70fd398ffb0160c8dc13b38a1abe590ff02676eab88c6cfe70850ef658ad427c9591b4e3bbca
+DIST thunderbird-91.3.2-ru.xpi 783358 BLAKE2B 18a6f4c61903b6c3ea36a58a30aedee9db65dce557f130344acaf31643a1e9ad067a1268b45b73742546c503224786b35c9564c543910f4d8d542e5fc3b207e1 SHA512 f96df9a299afca3cf62ca476b3ef844d898dadc36c7cb02978b6004f421d107f6f3710b6b85903049d8b8399f11b215967fa6796d5df075dedd453cd9fedcea7
+DIST thunderbird-91.3.2-sk.xpi 707731 BLAKE2B 8f9242c1c792091c419833569a9bbd5e0271ba98182275efa00f50d33890b0daa7aa2fdfc302961a25a7cd7292ebff6539114e6ccbbea4a6042eb94b934212c4 SHA512 f6f217e285b1681f293034e2836830937e2136f89fee25175781e09d65d65489d68b8bf59338aa31bc4122056bc77e66ee7c387c6977d827ffc4128f2a7d6864
+DIST thunderbird-91.3.2-sl.xpi 660446 BLAKE2B 660cc282735dd0b87e0d474d004514f5ef32f29757ee99130d2103183082f60d56408f40bd8194efa49bc473f375e8c4ce4791fee8c4461cbe67515447697ed3 SHA512 08aa812923eeb087c3af51d0fcba4743f17c8aba0770d3fd75919dc1cb92fc2f496568ccd347c6bc6dffdf0ef1d4821ae91b2b0e3dc5b883213cf921900852ea
+DIST thunderbird-91.3.2-sq.xpi 693388 BLAKE2B af4c67acd2c7b8b0d0aba77fe762025bd05621c4c72cd15168042806cb886a7a63f251531c8b2813e803c9d721932ef6a522a4944e75e7b4d50f3c66efd7c594 SHA512 6a5c51b8bf7986b2d0d47a245f64b05203941193844758a973829c17fa2882ced83d97b3de6b1fc876180bff2f9dd0f087ae3b11e045c47e81bc2e67b5f86dfd
+DIST thunderbird-91.3.2-sr.xpi 703326 BLAKE2B ed6beaa710835bdfb5711ad011f32ce9ebba3f46990e11a87c40a783a24a1120041cd1f8d37f844e50c0b4686e7b2f58c7143d0c0317d8cc98fc063cc34fc3ab SHA512 87ba1b687dea40a154aec863934258c0810c2ed8556a9539cce2341e9d17ae7fab9805d230201d62c62648e062f453ce24b3591e1106496d4a198df898f9e3c9
+DIST thunderbird-91.3.2-sv-SE.xpi 675811 BLAKE2B e5d2aef26c8d182724e096bc1b524cb074e46e8a9ef6f5fec7a462da439b81ac9c7e8185ef1c526948cc43bf4ae62dce7c508117ca923be5dbdeabf422094b39 SHA512 696a35a6734bd3bc782d8f7eb21d0081aa11609a48a57fbd66445b617d159945e96b1de21dc7bb84294dd0464c19c8c04a401db7ae14024ccf1b9003491a18ed
+DIST thunderbird-91.3.2-th.xpi 741242 BLAKE2B 491c71f031911c844c3b04c4d992e0196d4e068e59279b97a27075844ac493de7be2d6e2c37dbd2828ef07a1b749e314375c82992eaec3e6f79a8706f749ec6a SHA512 e2e5a1d32250934db0b2ac8312f0da1830f7830f4ed60179a11cd01429f4bdd21d2ecc3ac3184a0d57e485fe6aa47a9853a215acda0335046108edce4753bf6b
+DIST thunderbird-91.3.2-tr.xpi 685072 BLAKE2B 7c0b8d274a85357227dffd2cfba5c55d5f779d78abeb98e88f60045283c093daee89f718ac43a1c945a101c683e4daa4046ef273b503ca11df0ebe839fda7a7f SHA512 5d2121b964049d19dac24e12913d99d027733a64971a23daa7c7a397b5ea2c6e3395bca297e94438b4401000ce71a89ab56a05ff37f85dd5f3020bb8be32490c
+DIST thunderbird-91.3.2-uk.xpi 780970 BLAKE2B c5d8fcd5b4d9649c4b1106ac74eb08d416132a5a74583a050d4ca2ddb2fac9f513dc7ff7672179788d5403f3b645da3a1ff13687a6ef9705cd6bab7391e469b6 SHA512 54834e5ca88f6e77185352c9592a37ba539788a179eaa8690b17d04f6cc2d78d685253affc3f5042952a76574bc2946155d0d964f30b46e3cffdc8e84e9c9760
+DIST thunderbird-91.3.2-uz.xpi 588119 BLAKE2B df1a76076bdeebacf886b59ca850a4e3df200583d5912609741d0528c76cee61cb10ba9ec13faa2a5b828d0c186b9efa451aef3baee26e4867e5b54e0b55c361 SHA512 fb94400618a9839053902c39a62924000cf228969881d7868a3b2a59613eea752af9d2c0664231e5cd7869ac159e412da5cc304da4d82ff7f5ff314af8a14cd8
+DIST thunderbird-91.3.2-vi.xpi 706359 BLAKE2B 6dfba5be7833c2e3058e2698971212480d7173e4d93f4e87d01bd5cd347eba49ec16863b53bdb73a464fd8d82db552366fcbbf8a5eaeed2b7d7649ed0a1f71c4 SHA512 e01b7e442ce2bdd00bc225dbe3fa1aa4b12e04b629e6996c7fbba3198dcd9460a84f869f1f4f43353ad31ad9c3b4a4435933ba1fec8db9b7d1f6364c838e62af
+DIST thunderbird-91.3.2-zh-CN.xpi 714607 BLAKE2B 2ff1e8d346dcfeb7b5f69e49f98532c0f7ede33cce59ae9a17a9e7490be4641c78b23e0ce2bd6c9cf78bd4b81792d84625fbd45ab285dc485fb6896afc60b412 SHA512 9e5556afb814df13e67203742ba9faa5befe1d72d4fd4eb417d6c4f97500a258260c8e9d3e9fe11e527c572326deab643d3e94fe9a9cc09736b5496062c5b055
+DIST thunderbird-91.3.2-zh-TW.xpi 715955 BLAKE2B c03f07d9b7ac5deffc5bd55c6bbe29a9d6e954b0b3e7ab9cd76f370c73341cbebc9761f259e1b38569a48a5cf91bec7113462ed70019ae5eec3e8de897e4e97f SHA512 66f6909b3cadd6e560b3cdec8654bcbfb65f84b81a3c96d6a13aa0e75f166c4dbb744131d525c31f3b09c10c73884e72f0d4aeb2ea574c3f41229bed16b69e77
+DIST thunderbird-91.3.2.source.tar.xz 407454432 BLAKE2B e4e90272fb2f0491503e3b1a7be0722b5873ec7b65fccb7c48b227a1edcf62715fe4c820442f89507663c794274906a33a1e1906788c02975f604b3bff67ca06 SHA512 954be27795935e494d27d57da99b49ff61db8a2b26fa8e159a30d6c272033b015790735b40129d7de94f861af23cf748f88a7a45df3861f753d6e15d28fb366c
diff --git a/mail-client/thunderbird/thunderbird-91.3.2.ebuild b/mail-client/thunderbird/thunderbird-91.3.2.ebuild
new file mode 100644
index 000000000000..d053304bbe36
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-91.3.2.ebuild
@@ -0,0 +1,1133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-91esr-patches-01.tar.xz"
+
+LLVM_MAX_SLOT=13
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp"
+IUSE+=" wayland wifi"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	wifi? ( dbus )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.19.0
+	>=net-libs/nodejs-10.23.1
+	virtual/pkgconfig
+	>=virtual/rust-1.51.0
+	|| (
+		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.13 )
+	x86? ( >=dev-lang/nasm-2.13 )"
+
+CDEPEND="
+	>=dev-libs/nss-3.68
+	>=dev-libs/nspr-4.32
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	system-av1? (
+		>=media-libs/dav1d-0.8.1:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( media-sound/sndio )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )
+	!<x11-plugins/enigmail-2.2"
+
+DEPEND="${CDEPEND}
+	x11-libs/libICE
+	x11-libs/libSM
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
+			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
+			# bug 792705
+			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
+			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-js-shell \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable sndio
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4800a3347620..fc054b11c192 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild
index b58559de3751..d2d0f1535058 100644
--- a/media-gfx/gmic/gmic-2.9.9.ebuild
+++ b/media-gfx/gmic/gmic-2.9.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3787e0af3241..4f64ec9012e5 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 10af24628e46..8549f8b718fd 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -2,3 +2,4 @@ DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db53
 DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f
 DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b
 DIST intel-gmmlib-21.3.2.tar.gz 746990 BLAKE2B b9cc1937d551ff48e317b6a6b70a07f96e6ed1a4a1d27a4cf5be61e97a7ece71cf75a7f2d773f9a42e2c4ad8badf97c06a5cc0dd4a4fa38159a43839f1ac11ac SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be
+DIST intel-gmmlib-21.3.3.tar.gz 747305 BLAKE2B ef055bfdb6efccec5e2e7618677a97b38e314f44486c0d99e704281f2cb78acdf64a1737a8ae2c33b9dde6f60a284b83d9b5ca1949c5a5c7a34894cdbfbb9347 SHA512 9680b2c38f71467a7c4f2c1a6136d1de9c906355ca675ebbafc697daea15fe615aa45f3af3140330f1610946f9c55471038eeb815b1d677b64efb4896515d8fb
diff --git a/media-libs/gmmlib/gmmlib-21.3.3.ebuild b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
new file mode 100644
index 000000000000..75f21bc6ea03
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 23120cbe718b..b70546f80890 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,2 +1,2 @@
 DIST mesa-21.2.5.tar.xz 15829684 BLAKE2B a5d00d6c566e699acd1f8cfcf1b52024c92cfa8a4cc9a6fb1d6493526ea0d65790ed97c47c5c174d4369e589caf1a361351df6d43aba89f818970f87f9a81059 SHA512 aaa1ebaa1e18eea76c3784c9a65942c3e417c1079d7bf75dcede574999dc459fb4d68d041cf2f767afb9cbfa834a985e0a4edd5a56b0fc90f8fdc506359aa5da
-DIST mesa-21.3.0-rc3.tar.xz 16349156 BLAKE2B bc25478b7ee2c6186baf8f8540da7d5a6847146badd37653b65e2d3a47f8a7ae866825058ad54b68563ddb4f8409180ebb7415925409b6f0b401be81a45eca9d SHA512 14c3cdf2085077db3ec6d7e7b66304fccdaf441dfd64cc085d6d83960fcbdaa18a48d8f6bcdc096def06b6d389f51c1a5cb0a6793a236d668e22c592bc8b2e4c
+DIST mesa-21.3.0.tar.xz 16427424 BLAKE2B d3feac77b61ea724b841b88882569871eb8ff59561fa47b65a2358a0e912cd27f728a226795b23d63232daab6532b9931dd0d2fc8f001a1902dc6b75d474b44e SHA512 b27c0ccf2fc9b96bbece715612cec4f4e267ab25dc5386c3debd2346c385afa0146317c67a3d2eec198dbf5338fb182b458c5fe5567216b265153c0b7b560de1
diff --git a/media-libs/mesa/mesa-21.3.0_rc3.ebuild b/media-libs/mesa/mesa-21.3.0.ebuild
similarity index 97%
rename from media-libs/mesa/mesa-21.3.0_rc3.ebuild
rename to media-libs/mesa/mesa-21.3.0.ebuild
index 5829adce48f2..47b93133f0dc 100644
--- a/media-libs/mesa/mesa-21.3.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-21.3.0.ebuild
@@ -33,18 +33,15 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+	+classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
 	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
 	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
 	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
 	osmesa? ( gallium )
 	vulkan? ( video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
 	video_cards_crocus? ( gallium )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( classic )
@@ -64,7 +61,7 @@ REQUIRED_USE="
 	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
+	video_cards_vivante? ( gallium )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
@@ -384,12 +381,6 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	emesonargs+=(-Dplatforms=${platforms#,})
 
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -512,8 +503,9 @@ multilib_src_configure() {
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
 		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
+		-Degl=true
+		-Dgbm=true
+		-Dglvnd=true
 		$(meson_feature gles1)
 		$(meson_feature gles2)
 		$(meson_use osmesa)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5829adce48f2..47b93133f0dc 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -33,18 +33,15 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+	+classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
 	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
 	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
 	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
 	osmesa? ( gallium )
 	vulkan? ( video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
 	video_cards_crocus? ( gallium )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( classic )
@@ -64,7 +61,7 @@ REQUIRED_USE="
 	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
+	video_cards_vivante? ( gallium )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
@@ -384,12 +381,6 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	emesonargs+=(-Dplatforms=${platforms#,})
 
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -512,8 +503,9 @@ multilib_src_configure() {
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
 		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
+		-Degl=true
+		-Dgbm=true
+		-Dglvnd=true
 		$(meson_feature gles1)
 		$(meson_feature gles2)
 		$(meson_use osmesa)
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d395993ee653..edec7bc7d9f4 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 5317448d6e41..55cc58e257e4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Nov 2021 17:09:04 +0000
+Sat, 20 Nov 2021 03:39:05 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5317448d6e41..55cc58e257e4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Nov 2021 17:09:04 +0000
+Sat, 20 Nov 2021 03:39:05 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f87a86c92c93..046c323093a2 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 cc7ec71e5787..e27f0cd5442c 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/ansible-cmdb-1.28 b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
deleted file mode 100644
index c1d7ea27312f..000000000000
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.28
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DESCRIPTION=Ansible Configuration Management Database
-EAPI=6
-HOMEPAGE=https://github.com/fboender/ansible-cmdb
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/mako[python_targets_python3_8(-)?] dev-python/jsonxs[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.28.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e26ee05d67f9ba8c1290e1c54a0ef162
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.30 b/metadata/md5-cache/app-admin/ansible-cmdb-1.30
deleted file mode 100644
index f52e6f52bcb3..000000000000
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.30
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=Ansible Configuration Management Database
-EAPI=7
-HOMEPAGE=https://github.com/fboender/ansible-cmdb
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/mako[python_targets_python3_8(-)?] dev-python/jsonxs[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.30.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1bc0c620445adcbd8e0e4be5a8866cf2
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.30-r1 b/metadata/md5-cache/app-admin/ansible-cmdb-1.30-r1
new file mode 100644
index 000000000000..1553b221e0b2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-cmdb-1.30-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Ansible Configuration Management Database
+EAPI=8
+HOMEPAGE=https://github.com/fboender/ansible-cmdb
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonxs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.30.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54da5c7a34a39de1ec493f4eb291ed2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.22.10 b/metadata/md5-cache/app-admin/awscli-1.22.10
new file mode 100644
index 000000000000..38b1ebabd30b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.22.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.23.10[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-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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=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.23.10[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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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.10.tar.gz -> awscli-1.22.10.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a37c61a85be929b0333f1a3db63b2eb9
diff --git a/metadata/md5-cache/app-admin/clustershell-1.8.3 b/metadata/md5-cache/app-admin/clustershell-1.8.3
deleted file mode 100644
index d064aa25fc2a..000000000000
--- a/metadata/md5-cache/app-admin/clustershell-1.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?] )
-DESCRIPTION=Python framework for efficient cluster administration
-EAPI=7
-HOMEPAGE=https://cea-hpc.github.com/clustershell/
-IUSE=doc test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.8.3.tar.gz -> clustershell-1.8.3.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=38b91093e4409ae4323715ab915abd2b
diff --git a/metadata/md5-cache/app-admin/clustershell-1.8.3-r1 b/metadata/md5-cache/app-admin/clustershell-1.8.3-r1
new file mode 100644
index 000000000000..52b088c8a743
--- /dev/null
+++ b/metadata/md5-cache/app-admin/clustershell-1.8.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python framework for efficient cluster administration
+EAPI=8
+HOMEPAGE=https://cea-hpc.github.com/clustershell/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.8.3.tar.gz -> clustershell-1.8.3.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8a1008f887b8cbeb5fadfa2b1810ef34
diff --git a/metadata/md5-cache/app-admin/lib_users-0.15 b/metadata/md5-cache/app-admin/lib_users-0.15
index e8415a4d2d6b..12e96b52ecf1 100644
--- a/metadata/md5-cache/app-admin/lib_users-0.15
+++ b/metadata/md5-cache/app-admin/lib_users-0.15
@@ -4,7 +4,7 @@ DESCRIPTION=Check for mapped libs and open files that are marked as deleted
 EAPI=8
 HOMEPAGE=https://github.com/klausman/lib_users
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( 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/klausman/lib_users/archive/v0.15.tar.gz -> lib_users-0.15.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ee911f0f71b724ca9520da14bbb6ba0d
+_md5_=bbbd93e99c2556bb256cdc85c8a399b7
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index c09b33ac77c5..b4d14e659cc1 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2 b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
index 4aa34dedf22b..53ae0f2c98c9 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.ibm.com/us-en/marketplace/data-protection-and-recovery
 IUSE=acl java +tsm-cit +tsm-hw
 KEYWORDS=-* amd64
 LICENSE=Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C || ( BSD GPL-2+ ) gSOAP libpng tsm
-RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 ) || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
+RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 ) || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b591942ebf0ef3324203e41de360c770
+_md5_=560d4f41f08cf6d0f3aed98b34535363
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 12fa17f5021b..bab5b1fb8231 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.13.06-r1 b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.07
similarity index 91%
rename from metadata/md5-cache/app-benchmarks/stress-ng-0.13.06-r1
rename to metadata/md5-cache/app-benchmarks/stress-ng-0.13.07
index b915915b61a6..b5ae8f248e60 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.13.06-r1
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.07
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) sctp? ( net-misc/lksctp-tools )
 SLOT=0
-SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.13.06.tar.gz -> stress-ng-0.13.06.tar.gz
+SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.13.07.tar.gz -> stress-ng-0.13.07.tar.gz
 _eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8fde9aa8ecc0a2caa38c1166c75af56
+_md5_=671d79d95df9a0d11a92e1a1cb7ef86f
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e8fd4aad4103..4da31b52faea 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0 b/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
deleted file mode 100644
index e1af7feadcba..000000000000
--- a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/hidapi[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/json-c:=[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/pkgconfig test? ( dev-libs/check[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-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yubico Universal 2nd Factor (U2F) server C Library
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/libu2f-server/
-IUSE=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 x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/hidapi[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/json-c:=[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/0.1
-SRC_URI=https://developers.yubico.com/libu2f-server/Releases/libu2f-server-1.1.0.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b62380365ba2b81f63f944371f7bb2e
diff --git a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0-r2 b/metadata/md5-cache/app-crypt/libu2f-server-1.1.0-r2
index de3fe674c38b..38450d36f4b5 100644
--- a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0-r2
+++ b/metadata/md5-cache/app-crypt/libu2f-server-1.1.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Yubico Universal 2nd Factor (U2F) server C Library
 EAPI=8
 HOMEPAGE=https://developers.yubico.com/libu2f-server/
 IUSE=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 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/hidapi[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/json-c:=[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/0.1
 SRC_URI=https://developers.yubico.com/libu2f-server/Releases/libu2f-server-1.1.0.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67a73a06230ba88a504752222a019324
+_md5_=867dced210c9fed848c1595f86b73178
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a9d2ac5a55f7..f9db03af9773 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-20.0.4-r1 b/metadata/md5-cache/app-emulation/crossover-bin-20.0.4-r1
index b38f17b3dba9..d8246703c649 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-20.0.4-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-20.0.4-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
 IUSE=+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) !prefix? ( sys-libs/glibc ) !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/openssl dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) !prefix? ( sys-libs/glibc ) !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/openssl dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-20.0.4.bin
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=84af127605401cb1f60e89fd807258eb
+_md5_=f2b39b251cd5ae82251460de136a8477
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-21.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-21.0.0
index 810b75421620..ab7f26d7802a 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-21.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-21.0.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
 IUSE=+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) !prefix? ( sys-libs/glibc ) !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/openssl dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) !prefix? ( sys-libs/glibc ) !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/openssl dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-21.0.0.bin
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=4d1aed1fe8d17146e1884a4f4afb29ff
+_md5_=8c58ea1e51086536efd775b169cc4220
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.26 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.26
index 65976c60850f..2203fe824469 100644
--- a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.26
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.26
@@ -4,7 +4,7 @@ DESCRIPTION=PyQt5-based launcher for FS-UAE
 EAPI=8
 HOMEPAGE=https://fs-uae.net/
 IUSE=lha python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=app-emulation/fs-uae python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] lha? ( dev-python/python-lhafile[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] lha? ( dev-python/python-lhafile[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/FrodeSolheim/fs-uae-launcher/archive/refs/tags/v3.1.26.tar.gz -> fs-uae-launcher-3.1.26.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5f62c5ce293cb02300b2805060cdae08
+_md5_=380979c0893b12217794987cd1d5644b
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 9234fcf7fca6..04ad7ae95e01 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/collectd-5.12.0-r2 b/metadata/md5-cache/app-metrics/collectd-5.12.0-r2
new file mode 100644
index 000000000000..667c14e24258
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/collectd-5.12.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= ) collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp:= ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_procevent? ( dev-libs/yajl:= ) collectd_plugins_python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_slurm? ( sys-cluster/slurm ) collectd_plugins_smart? ( dev-libs/libatasmart:0= ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_sysevent? ( dev-libs/yajl:= ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.8 ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Collects system statistics and provides mechanisms to store the values
+EAPI=7
+HOMEPAGE=https://collectd.org/
+IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_buddyinfo collectd_plugins_capabilities collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_check_uptime collectd_plugins_chrony collectd_plugins_connectivity collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_gpu_nvidia collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_logparser collectd_plugins_log_logstash collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_pcie_errors collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_procevent collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_slurm collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_synproxy collectd_plugins_sysevent collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_turbostat collectd_plugins_ubi collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_influxdb_udp collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_stackdriver collectd_plugins_write_syslog collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD collectd_plugins_java kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~x86
+LICENSE=MIT GPL-2 GPL-2+ GPL-3 GPL-3+
+RDEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= ) collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp:= ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_procevent? ( dev-libs/yajl:= ) collectd_plugins_python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_slurm? ( sys-cluster/slurm ) collectd_plugins_smart? ( dev-libs/libatasmart:0= ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_sysevent? ( dev-libs/yajl:= ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.8 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=collectd_plugins_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) collectd_plugins_python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
+SLOT=0
+SRC_URI=https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=501af37a606b47137e974c52f5138090
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 6726730928ba..fdc5cf166919 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/filebus-0.3.5 b/metadata/md5-cache/app-misc/filebus-0.3.5
new file mode 100644
index 000000000000..d89f865cc1ba
--- /dev/null
+++ b/metadata/md5-cache/app-misc/filebus-0.3.5
@@ -0,0 +1,15 @@
+BDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] inotify? ( dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=A user space multicast named pipe implementation backed by a regular file
+EAPI=7
+HOMEPAGE=https://github.com/pipebus/filebus
+IUSE=+inotify python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] inotify? ( dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/filebus/filebus-0.3.5.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae198500919695a8abc7c4d9b340a0fd
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8e5677aeb2ef..60a138319726 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/cmark-0.29.0 b/metadata/md5-cache/app-text/cmark-0.29.0
deleted file mode 100644
index e5b4a4ab418a..000000000000
--- a/metadata/md5-cache/app-text/cmark-0.29.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) )
-DESCRIPTION=CommonMark parsing and rendering library and program in C
-EAPI=7
-HOMEPAGE=https://github.com/commonmark/cmark
-IUSE=test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD-2
-RESTRICT=!test? ( test )
-SLOT=0/0.29.0
-SRC_URI=https://github.com/commonmark/cmark/archive/0.29.0.tar.gz -> cmark-0.29.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ce62b183bd4f31011f11d3032e3b84a2
diff --git a/metadata/md5-cache/app-text/cmark-0.30.2 b/metadata/md5-cache/app-text/cmark-0.30.2
index 02d238190f0e..5cd09ad54d23 100644
--- a/metadata/md5-cache/app-text/cmark-0.30.2
+++ b/metadata/md5-cache/app-text/cmark-0.30.2
@@ -4,10 +4,10 @@ DESCRIPTION=CommonMark parsing and rendering library and program in C
 EAPI=8
 HOMEPAGE=https://github.com/commonmark/cmark
 IUSE=test
-KEYWORDS=amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/0.30.2
 SRC_URI=https://github.com/commonmark/cmark/archive/0.30.2.tar.gz -> cmark-0.30.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5a1ba4d62740ca538b8059a75b9d67c5
+_md5_=52dbc1f540e6d901eb6d9c20b9cf5d55
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index aa4b4d51faec..2c6f97bfab82 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/aws-22.0.0 b/metadata/md5-cache/dev-ada/aws-22.0.0
new file mode 100644
index 000000000000..095e9323ef00
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/aws-22.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-ada/gnatcoll-core:=[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),shared,static-libs] dev-libs/openssl dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-)]
+DESCRIPTION=A complete Web development framework
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/tools/aws/
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/gnatcoll-core:=[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),shared,static-libs] dev-libs/openssl
+REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+SLOT=0
+SRC_URI=https://github.com/AdaCore/aws/archive/refs/tags/v22.0.0.tar.gz -> aws-22.0.0.tar.gz https://github.com/AdaCore/templates-parser/archive/refs/tags/v22.0.0.tar.gz -> templates-parser-22.0.0.tar.gz
+_eclasses_=ada	404e63451400970e82fe33ec6856fe0d	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=c206319489744911713c5ce32140b401
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6dbe8e7a709f..d9cff9368c78 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.5 b/metadata/md5-cache/dev-db/mariadb-10.6.5
index 897457064ebf..84d105620b3b 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.5
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.5
@@ -5,12 +5,13 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl elibc_FreeBSD jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:0= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
-SRC_URI=mirror://mariadb/mariadb-10.6.5/source/mariadb-10.6.5.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.6.5-patches-01.tar.xz
+SRC_URI=mirror://mariadb/mariadb-10.6.5/source/mariadb-10.6.5.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.6.5-patches-02.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=78ab362f37a9f9175aa5663e8cea0586
+_md5_=988cdbdee3ae655784b353e2727cc728
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13-r1 b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13-r1
index fcd306acd4ab..92a02b0619bf 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13-r1
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13-r1
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=https://www.percona.com/software/percona-xtrabackup
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libaio dev-libs/libgcrypt:0/20 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib sys-process/numactl || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] ) !dev-db/percona-xtrabackup
+RDEPEND=dev-libs/libaio dev-libs/libgcrypt:0/20 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib sys-process/numactl || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] ) !dev-db/percona-xtrabackup
 SLOT=0
 SRC_URI=amd64? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.13/binary/tarball/percona-xtrabackup-2.4.13-Linux-x86_64.libgcrypt20.tar.gz ) x86? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.13/binary/tarball/percona-xtrabackup-2.4.13-Linux-i686.libgcrypt20.tar.gz )
-_md5_=8d4f3374c322529f665e024a2b558673
+_md5_=b1e9c70f9313577d3c3488c1b2aa5a52
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6828faaabf3e..11a014a7d6bc 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/botan-2.18.2 b/metadata/md5-cache/dev-libs/botan-2.18.2
index 0e10fe3e989b..6851f893dd64 100644
--- a/metadata/md5-cache/dev-libs/botan-2.18.2
+++ b/metadata/md5-cache/dev-libs/botan-2.18.2
@@ -5,11 +5,11 @@ DESCRIPTION=C++ crypto library
 EAPI=8
 HOMEPAGE=https://botan.randombit.net/
 IUSE=bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-libs/openssl:0=[bindist(-)=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=2/2.18
 SRC_URI=https://botan.randombit.net/releases/Botan-2.18.2.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.18.2.tar.xz.asc )
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=9a0c0b4b89068f0d77f5cd3d1a10bc05
+_md5_=8d2c682e3763044005ae73619e30ed34
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-21.45.21574 b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.45.21574
new file mode 100644
index 000000000000..67241afa25b0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.45.21574
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.4 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.4 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/21.45.21574.tar.gz -> intel-compute-runtime-21.45.21574.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=87a8cf92f62a08206f144a08dc4586a1
diff --git a/metadata/md5-cache/dev-libs/starpu-1.3.9 b/metadata/md5-cache/dev-libs/starpu-1.3.9
index 554cf81fac2a..3227fd987fa4 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.3.9
+++ b/metadata/md5-cache/dev-libs/starpu-1.3.9
@@ -5,11 +5,11 @@ DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=7
 HOMEPAGE=https://starpu.gitlabpages.inria.fr/
 IUSE=blas cuda doc examples fftw fortran hdf5 mpi opencl opengl openmp spinlock-check static-libs test valgrind
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://files.inria.fr/starpu/starpu-1.3.9/starpu-1.3.9.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=00a225b371ab64392b3b97ebe00b746f
+_md5_=ac4fb3887b616c9bb99bc5608b2fe4f5
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index f8d9b024879f..f0390ffa7c47 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/luasec-1.0.2-r1 b/metadata/md5-cache/dev-lua/luasec-1.0.2-r1
index 81a15c8a681d..a81d982adb91 100644
--- a/metadata/md5-cache/dev-lua/luasec-1.0.2-r1
+++ b/metadata/md5-cache/dev-lua/luasec-1.0.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
 EAPI=8
 HOMEPAGE=https://github.com/brunoos/luasec
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r103[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v1.0.2.tar.gz -> luasec-1.0.2.tar.gz
 _eclasses_=lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=28c6a91464f28ff20175b9ef5a4eff7e
+_md5_=9be8b1f0716dab49430d3838b9f2582f
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
deleted file mode 100644
index ddfca02e7f8f..000000000000
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=Networking support library for the Lua language
-EAPI=7
-HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
-IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef1f5458e2e3b6a84108b32d1d732569
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r103 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r103
index 9920cbd6dd95..b91165384457 100644
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r103
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r103
@@ -5,7 +5,7 @@ DESCRIPTION=Networking support library for the Lua language
 EAPI=8
 HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
 _eclasses_=lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1669f6c98a0fb51319e6b2fccecfb545
+_md5_=d3542670f8f48c5a89dd438a5fbf9871
diff --git a/metadata/md5-cache/dev-perl/MP3-Info-1.260.0 b/metadata/md5-cache/dev-perl/MP3-Info-1.260.0-r1
similarity index 70%
rename from metadata/md5-cache/dev-perl/MP3-Info-1.260.0
rename to metadata/md5-cache/dev-perl/MP3-Info-1.260.0-r1
index 7e6482ee1618..06f98f475504 100644
--- a/metadata/md5-cache/dev-perl/MP3-Info-1.260.0
+++ b/metadata/md5-cache/dev-perl/MP3-Info-1.260.0-r1
@@ -1,13 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=A Perl module to manipulate/fetch info from MP3 files
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/MP3-Info
-IUSE=examples
+IUSE=test examples
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMERELO/MP3-Info-1.26.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=89ea2fb7b2fd1ca9da9ec69b75ac6d1b
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=d902556eaddec55bd4b061a91fb8fd05
diff --git a/metadata/md5-cache/dev-perl/MP3-Tag-1.150.0 b/metadata/md5-cache/dev-perl/MP3-Tag-1.150.0-r1
similarity index 63%
rename from metadata/md5-cache/dev-perl/MP3-Tag-1.150.0
rename to metadata/md5-cache/dev-perl/MP3-Tag-1.150.0-r1
index d3720c482166..9e42ed79c6e9 100644
--- a/metadata/md5-cache/dev-perl/MP3-Tag-1.150.0
+++ b/metadata/md5-cache/dev-perl/MP3-Tag-1.150.0-r1
@@ -1,13 +1,15 @@
+BDEPEND=dev-perl/MP3-Info virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/MP3-Info virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=Module for reading tags of MP3 Audio files
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/MP3-Tag
-IUSE=examples
+IUSE=test examples
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic
 RDEPEND=dev-perl/MP3-Info dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.15.zip
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=34ae19cc89c3faa9ee578aa248447fc6
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=3a6452d50fcb7e9b3afcf5c72c584eef
diff --git a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0 b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
deleted file mode 100644
index 76e55145ed31..000000000000
--- a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Encode dev-perl/IO-String dev-lang/perl:=[-build(-)]
-DESCRIPTION=Fetch info from MPEG-4 files (.mp4, .m4a, .m4p, .3gp)
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/MP4-Info
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode dev-perl/IO-String dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JH/JHAR/MP4-Info-1.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43d9d284afa26b6afad87e2f286047f2
diff --git a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0-r1 b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0-r1
new file mode 100644
index 000000000000..3e0bab670ad1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Encode dev-perl/IO-String dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Fetch info from MPEG-4 files (.mp4, .m4a, .m4p, .3gp)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/MP4-Info
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Encode dev-perl/IO-String dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JH/JHAR/MP4-Info-1.13.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=284f8e4a32fe93dc30b33952f32cb57c
diff --git a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0 b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0-r1
similarity index 76%
rename from metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
rename to metadata/md5-cache/dev-perl/MRO-Compat-0.130.0-r1
index be4456144945..a4dbbb11f963 100644
--- a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
+++ b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0-r1
@@ -1,7 +1,8 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=Lets you build groups of accessors
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/MRO-Compat
 IUSE=test
 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
@@ -10,5 +11,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=c87a73b7f1ac67be574b2fd492185245
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=576e24186a274eb924ca809ddc1c4d21
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 58636268cff8..c4b0995bdb4c 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Mozilla-CA-20999999 b/metadata/md5-cache/dev-perl/Mozilla-CA-20999999-r1
similarity index 69%
rename from metadata/md5-cache/dev-perl/Mozilla-CA-20999999
rename to metadata/md5-cache/dev-perl/Mozilla-CA-20999999-r1
index 63ee65af0383..ef4c9423bbb1 100644
--- a/metadata/md5-cache/dev-perl/Mozilla-CA-20999999
+++ b/metadata/md5-cache/dev-perl/Mozilla-CA-20999999-r1
@@ -1,12 +1,15 @@
+BDEPEND=app-misc/ca-certificates virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=Mozilla's CA cert bundle in PEM format (Gentoo stub)
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mozilla-CA
+IUSE=test
 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=MPL-2.0
 RDEPEND=app-misc/ca-certificates dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/Mozilla-CA-20999999.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5ce12d49a1b604e3de33234dd1e818b7
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=26e1519999744874f997a19d3179101a
diff --git a/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.0 b/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.5
similarity index 52%
rename from metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.0
rename to metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.5
index 7e2070ae98e1..30551acef67c 100644
--- a/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.0
+++ b/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.5
@@ -1,7 +1,8 @@
+BDEPEND=virtual/perl-Exporter dev-perl/URI virtual/perl-IO >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-Test-Simple virtual/perl-File-Spec ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Exporter dev-perl/URI virtual/perl-IO >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-Test-Simple virtual/perl-File-Spec ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=Get a domain name's public suffix via the Mozilla Public Suffix List
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mozilla-PublicSuffix
 IUSE=test
 KEYWORDS=~amd64 ~x86
@@ -9,6 +10,6 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RS/RSIMOES/Mozilla-PublicSuffix-v1.0.0.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=2e955807e89874b5844223346a428126
+SRC_URI=mirror://cpan/authors/id/T/TO/TOMHUKINS/Mozilla-PublicSuffix-v1.0.5.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=b365ebca42d73ae1d0fdd0df2fffce86
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0-r1
similarity index 65%
rename from metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
rename to metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0-r1
index 8d24b7c68105..490af65429d1 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0-r1
@@ -1,7 +1,8 @@
+BDEPEND=ipv6? ( dev-perl/Socket6 ) virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ipv6? ( dev-perl/Socket6 ) virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=Manipulation and operations on IP addresses
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/NetAddr-IP
 IUSE=ipv6 test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
@@ -10,5 +11,5 @@ RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=75e1c52e8322aef06b14617f3c6d76b6
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=60377cc8ed49de4fbe3947ca1f1a84e3
diff --git a/metadata/md5-cache/dev-perl/mecab-perl-0.996 b/metadata/md5-cache/dev-perl/mecab-perl-0.996-r1
similarity index 69%
rename from metadata/md5-cache/dev-perl/mecab-perl-0.996
rename to metadata/md5-cache/dev-perl/mecab-perl-0.996-r1
index 015e0433b3a6..91d581fba8bd 100644
--- a/metadata/md5-cache/dev-perl/mecab-perl-0.996
+++ b/metadata/md5-cache/dev-perl/mecab-perl-0.996-r1
@@ -1,12 +1,15 @@
+BDEPEND=~app-text/mecab-0.996 dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=~app-text/mecab-0.996 dev-lang/perl
 DESCRIPTION=Perl binding for MeCab
-EAPI=6
+EAPI=8
 HOMEPAGE=http://taku910.github.io/mecab/
+IUSE=test
 KEYWORDS=amd64 ~ia64 x86
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 RDEPEND=~app-text/mecab-0.996 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-perl-0.996.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5796154c42c4e47dc9f7f001837275f9
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=30e61c21a22dd195501f220ec8247883
diff --git a/metadata/md5-cache/dev-perl/mime-construct-1.1100.0-r1 b/metadata/md5-cache/dev-perl/mime-construct-1.1100.0-r2
similarity index 62%
rename from metadata/md5-cache/dev-perl/mime-construct-1.1100.0-r1
rename to metadata/md5-cache/dev-perl/mime-construct-1.1100.0-r2
index 2d98a77a3a53..fa180a86badc 100644
--- a/metadata/md5-cache/dev-perl/mime-construct-1.1100.0-r1
+++ b/metadata/md5-cache/dev-perl/mime-construct-1.1100.0-r2
@@ -1,12 +1,15 @@
+BDEPEND=virtual/perl-MIME-Base64 dev-perl/Email-Date-Format dev-perl/MIME-Types dev-perl/Proc-WaitStat dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-MIME-Base64 dev-perl/Email-Date-Format dev-perl/MIME-Types dev-perl/Proc-WaitStat dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=construct and optionally mail MIME messages
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/mime-construct
+IUSE=test
 KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=virtual/perl-MIME-Base64 dev-perl/Email-Date-Format dev-perl/MIME-Types dev-perl/Proc-WaitStat dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=ce455e243617d1dc6975bf518903d4f3
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=765f0fad4f090391c8a51fe57e7e8154
diff --git a/metadata/md5-cache/dev-perl/multidimensional-0.13.0 b/metadata/md5-cache/dev-perl/multidimensional-0.13.0
deleted file mode 100644
index 98a7d8c7d3e9..000000000000
--- a/metadata/md5-cache/dev-perl/multidimensional-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/B-Hooks-OP-Check-0.190.0 >=dev-perl/Lexical-SealRequireHints-0.5.0 virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker dev-perl/ExtUtils-Depends test? ( >=virtual/perl-CPAN-Meta-2.112.580 >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DESCRIPTION=disables multidimensional array emulation
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/multidimensional
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/B-Hooks-OP-Check-0.190.0 >=dev-perl/Lexical-SealRequireHints-0.5.0 virtual/perl-XSLoader dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/multidimensional-0.013.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6d3d0e12378ddb231c49a22d9c233b58
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index efe45385e517..76e19e621aae 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/ansible-compat-0.5.0 b/metadata/md5-cache/dev-python/ansible-compat-0.5.0
index d1dddf1b3da8..3e31963ee958 100644
--- a/metadata/md5-cache/dev-python/ansible-compat-0.5.0
+++ b/metadata/md5-cache/dev-python/ansible-compat-0.5.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-0.5.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b201bf8d023944542d5b3893cd9bf02
+_md5_=e91f4bea77d77668a6b698579d959c5d
diff --git a/metadata/md5-cache/dev-python/boto3-1.20.10 b/metadata/md5-cache/dev-python/boto3-1.20.10
new file mode 100644
index 000000000000..924270e49e4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.20.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.23.10[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-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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=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 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.23.10[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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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.20.10.tar.gz -> boto3-1.20.10.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c51591a1300e14982c151e391ee35158
diff --git a/metadata/md5-cache/dev-python/botocore-1.23.10 b/metadata/md5-cache/dev-python/botocore-1.23.10
new file mode 100644
index 000000000000..8f037f202785
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.23.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[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[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-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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=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 ~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[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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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.23.10.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c94e160d089e43fa40d86c0514ac6fde
diff --git a/metadata/md5-cache/dev-python/debugpy-1.5.1 b/metadata/md5-cache/dev-python/debugpy-1.5.1
index a70eca3a0781..9cfda0938d3c 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.5.1
+++ b/metadata/md5-cache/dev-python/debugpy-1.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
 EAPI=8
 HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/microsoft/debugpy/archive/v1.5.1.tar.gz -> debugpy-1.5.1.gh.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=84b9d983c8405347ec80e70db049a1c1
+_md5_=7cb9c651041f52207b5eff30fef16b43
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.2.0-r1 b/metadata/md5-cache/dev-python/ipykernel-6.2.0-r1
index b8b7b76352b1..51458fdd245a 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.2.0-r1
+++ b/metadata/md5-cache/dev-python/ipykernel-6.2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=IPython Kernel for Jupyter
 EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debugpy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/debugpy-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/ipython-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/traitlets-4.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/traitlets-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jupyter_client-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <www-servers/tornado-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/matplotlib-inline-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/matplotlib-inline-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.2.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=22da016e982b88e2b725f1657421c54f
+_md5_=4203afcc63922947991f5f848da1fa1f
diff --git a/metadata/md5-cache/dev-python/ipyparallel-7.1.0 b/metadata/md5-cache/dev-python/ipyparallel-7.1.0
index 4e256c924263..5c7e27a46290 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-7.1.0
+++ b/metadata/md5-cache/dev-python/ipyparallel-7.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Interactive Parallel Computing with IPython
 EAPI=8
 HOMEPAGE=https://ipyparallel.readthedocs.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( 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/i/ipyparallel/ipyparallel-7.1.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b98234f8b3ab354bb518384312cd4b26
+_md5_=54e5b1a97679eba53e65d8a7b53ab856
diff --git a/metadata/md5-cache/dev-python/nose2-0.10.0 b/metadata/md5-cache/dev-python/nose2-0.10.0
index 8f0673734c46..6239f43e6469 100644
--- a/metadata/md5-cache/dev-python/nose2-0.10.0
+++ b/metadata/md5-cache/dev-python/nose2-0.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=Next generation unittest with plugins
 EAPI=7
 HOMEPAGE=https://github.com/nose-devs/nose2
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/nose-devs/nose2/archive/0.10.0.tar.gz -> nose2-0.10.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4cf828b2e93dfdb1841408fe126019b2
+_md5_=b03d33bd4bd9ee93f799599cbea55d16
diff --git a/metadata/md5-cache/dev-python/pydevd-2.7.0 b/metadata/md5-cache/dev-python/pydevd-2.7.0
index 6d9b83d13304..1443721746d0 100644
--- a/metadata/md5-cache/dev-python/pydevd-2.7.0
+++ b/metadata/md5-cache/dev-python/pydevd-2.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
 EAPI=8
 HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=EPL-1.0
 RDEPEND=!<dev-python/debugpy-1.4.2 sys-devel/gdb python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fabioz/PyDev.Debugger/archive/pydev_debugger_2_7_0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dcdb860031b90bfa66a6770b7b245dfd
+_md5_=f672b21f705daf66a193cdd57a3bbb7b
diff --git a/metadata/md5-cache/dev-python/pygit2-1.7.1 b/metadata/md5-cache/dev-python/pygit2-1.7.1
new file mode 100644
index 000000000000..86dd185f4edb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygit2-1.7.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( =dev-libs/libgit2-1.3*:= >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libgit2-1.3*:= >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python bindings for libgit2
+EAPI=8
+HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND==dev-libs/libgit2-1.3*:= >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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/pygit2/pygit2-1.7.1.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=864108dd8de4c066ab1b8094913d6d88
diff --git a/metadata/md5-cache/dev-python/pytest-tornado-0.8.1 b/metadata/md5-cache/dev-python/pytest-tornado-0.8.1
index 13f70a04282d..ee0cba1be5c9 100644
--- a/metadata/md5-cache/dev-python/pytest-tornado-0.8.1
+++ b/metadata/md5-cache/dev-python/pytest-tornado-0.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=Fixtures and markers to simplify testing of asynchronous tornado app
 EAPI=8
 HOMEPAGE=https://github.com/eugeniy/pytest-tornado
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( 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/eugeniy/pytest-tornado/archive/refs/tags/v0.8.1.tar.gz -> pytest-tornado-0.8.1.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a73fd74cb1e47531b3b1b1c6b2e928cf
+_md5_=0c5aa368b121c7c7dda86937bda0fecf
diff --git a/metadata/md5-cache/dev-python/python-lhafile-0.3.0 b/metadata/md5-cache/dev-python/python-lhafile-0.3.0
index 745885b8254a..d0225d760545 100644
--- a/metadata/md5-cache/dev-python/python-lhafile-0.3.0
+++ b/metadata/md5-cache/dev-python/python-lhafile-0.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=LHA archive support for Python
 EAPI=7
 HOMEPAGE=https://fengestad.no/python-lhafile/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/FrodeSolheim/python-lhafile/archive/v0.3.0.tar.gz -> python-lhafile-0.3.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2070f34178eb7186a48ff31e6264f03c
+_md5_=bacb9ab21aec09a42315f5ee569d88da
diff --git a/metadata/md5-cache/dev-python/pyudev-0.22.0-r1 b/metadata/md5-cache/dev-python/pyudev-0.22.0-r1
new file mode 100644
index 000000000000..84aae68fad83
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyudev-0.22.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Python binding to libudev
+EAPI=7
+HOMEPAGE=https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev
+IUSE=qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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/pyudev/pyudev-0.22.0.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1eaa4f61a0fcaf3126b28b1c90f49c77
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20-r1 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.20-r1
deleted file mode 100644
index 11b53a224374..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.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:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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/SQLAlchemy/SQLAlchemy-1.4.20.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1a3e2d95db17185215ca7e4683fe137c
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.22-r1 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.22-r1
deleted file mode 100644
index 864386cd9c1d..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.22-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.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:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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/SQLAlchemy/SQLAlchemy-1.4.22.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d571c2affe9bb6e46daf6bee811782c7
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.23-r1 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.23-r1
deleted file mode 100644
index 372d602b58c4..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.23-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) ) test? ( >=dev-python/pytest-4.5.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:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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/SQLAlchemy/SQLAlchemy-1.4.23.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=27ab9337ef0ca6c0acafb55e52d5fce8
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.25-r1 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.25-r1
deleted file mode 100644
index 902535a58038..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.25-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) ) test? ( >=dev-python/pytest-4.5.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:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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/SQLAlchemy/SQLAlchemy-1.4.25.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4e4920bff244bde14e05ecf0c8694c8
diff --git a/metadata/md5-cache/dev-python/untangle-1.1.1 b/metadata/md5-cache/dev-python/untangle-1.1.1
index fd9364b3fd6c..41c793b44f5f 100644
--- a/metadata/md5-cache/dev-python/untangle-1.1.1
+++ b/metadata/md5-cache/dev-python/untangle-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Convert XML documents into Python objects
 EAPI=8
 HOMEPAGE=https://github.com/stchris/untangle
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/untangle/untangle-1.1.1.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1bfa88408abe58961eae96f8ba5ecd0b
+_md5_=06a7ec2f2fbd3e321fa41e57b4beead6
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.4.0 b/metadata/md5-cache/dev-python/zope-testrunner-5.4.0
new file mode 100644
index 000000000000..755ae93912a5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.4.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 prepare test
+DESCRIPTION=Zope testrunner script
+EAPI=8
+HOMEPAGE=https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ZPL
+RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_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/z/zope.testrunner/zope.testrunner-5.4.0.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e3b67fa04f943d9dc42396513abc3338
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 98ef973884f1..836bbe282bad 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.19.12 b/metadata/md5-cache/dev-vcs/topgit-0.19.12
deleted file mode 100644
index 172f8854e4b4..000000000000
--- a/metadata/md5-cache/dev-vcs/topgit-0.19.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/sed virtual/awk
-DEFINED_PHASES=compile install
-DESCRIPTION=A different patch queue manager
-EAPI=7
-HOMEPAGE=https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-2.10.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mackyle/topgit/archive/topgit-0.19.12.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=be33ba537a4dc59e6ff436e37ebd5f35
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.19.13 b/metadata/md5-cache/dev-vcs/topgit-0.19.13
index e85ccd8669bc..6a8ab1bf8cdf 100644
--- a/metadata/md5-cache/dev-vcs/topgit-0.19.13
+++ b/metadata/md5-cache/dev-vcs/topgit-0.19.13
@@ -4,11 +4,11 @@ DESCRIPTION=A different patch queue manager
 EAPI=8
 HOMEPAGE=https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-2.10.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mackyle/topgit/archive/topgit-0.19.13.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=31cb0b7e89eca568acb65c10a2bfdd35
+_md5_=66595324335be592c6349a92e359a323
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 5c08f4a0f351..5e569003d879 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/knights-demo-1.32-r3 b/metadata/md5-cache/games-strategy/knights-demo-1.32-r3
index 89ad7e5a8dcb..49d242c45fcb 100644
--- a/metadata/md5-cache/games-strategy/knights-demo-1.32-r3
+++ b/metadata/md5-cache/games-strategy/knights-demo-1.32-r3
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=knights
 KEYWORDS=~amd64 ~x86
 LICENSE=knights-demo
-RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
+RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/knights-demo-1.32.run
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=258d41d8f911303fce7f5102350161b0
+_md5_=fccddcd921440e6570ba298b7fb1df8f
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 08773c16b1aa..9996cf938cfd 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/thunderbird-91.3.2 b/metadata/md5-cache/mail-client/thunderbird-91.3.2
new file mode 100644
index 000000000000..09c933de9983
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-91.3.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thunderbird Mail Client
+EAPI=7
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla ) !<x11-plugins/enigmail-2.2
+REQUIRED_USE=debug? ( !system-av1 ) wifi? ( dbus )
+SLOT=0/91
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/source/thunderbird-91.3.2.source.tar.xz -> thunderbird-91.3.2.source.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-01.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/af.xpi -> thunderbird-91.3.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ar.xpi -> thunderbird-91.3.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ast.xpi -> thunderbird-91.3.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/be.xpi -> thunderbird-91.3.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/bg.xpi -> thunderbird-91.3.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/br.xpi -> thunderbird-91.3.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ca.xpi -> thunderbird-91.3.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/cak.xpi -> thunderbird-91.3.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/cs.xpi -> thunderbird-91.3.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/cy.xpi -> thunderbird-91.3.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/da.xpi -> thunderbird-91.3.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/de.xpi -> thunderbird-91.3.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-91.3.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/el.xpi -> thunderbird-91.3.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-91.3.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-91.3.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-91.3.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-91.3.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/et.xpi -> thunderbird-91.3.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/eu.xpi -> thunderbird-91.3.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/fi.xpi -> thunderbird-91.3.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/fr.xpi -> thunderbird-91.3.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-91.3.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-91.3.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/gd.xpi -> thunderbird-91.3.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/gl.xpi -> thunderbird-91.3.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/he.xpi -> thunderbird-91.3.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/hr.xpi -> thunderbird-91.3.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-91.3.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/hu.xpi -> thunderbird-91.3.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/id.xpi -> thunderbird-91.3.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/is.xpi -> thunderbird-91.3.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/it.xpi -> thunderbird-91.3.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ja.xpi -> thunderbird-91.3.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ka.xpi -> thunderbird-91.3.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/kab.xpi -> thunderbird-91.3.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/kk.xpi -> thunderbird-91.3.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ko.xpi -> thunderbird-91.3.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/lt.xpi -> thunderbird-91.3.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/lv.xpi -> thunderbird-91.3.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ms.xpi -> thunderbird-91.3.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-91.3.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/nl.xpi -> thunderbird-91.3.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-91.3.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-91.3.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pl.xpi -> thunderbird-91.3.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-91.3.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-91.3.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/rm.xpi -> thunderbird-91.3.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ro.xpi -> thunderbird-91.3.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ru.xpi -> thunderbird-91.3.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sk.xpi -> thunderbird-91.3.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sl.xpi -> thunderbird-91.3.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sq.xpi -> thunderbird-91.3.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sr.xpi -> thunderbird-91.3.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-91.3.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/th.xpi -> thunderbird-91.3.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/tr.xpi -> thunderbird-91.3.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/uk.xpi -> thunderbird-91.3.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/uz.xpi -> thunderbird-91.3.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/vi.xpi -> thunderbird-91.3.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-91.3.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-91.3.2-zh-TW.xpi )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=1a833a5e4a5211a58a8267d9ea58fe5b
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-91.3.2 b/metadata/md5-cache/mail-client/thunderbird-bin-91.3.2
new file mode 100644
index 000000000000..a957d4392222
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-91.3.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thunderbird Mail Client
+EAPI=7
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/91
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/en-US/thunderbird-91.3.2.tar.bz2 -> thunderbird-bin_x86_64-91.3.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/en-US/thunderbird-91.3.2.tar.bz2 -> thunderbird-bin_i686-91.3.2.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/af.xpi -> thunderbird-91.3.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ar.xpi -> thunderbird-91.3.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ast.xpi -> thunderbird-91.3.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/be.xpi -> thunderbird-91.3.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/bg.xpi -> thunderbird-91.3.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/br.xpi -> thunderbird-91.3.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ca.xpi -> thunderbird-91.3.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/cak.xpi -> thunderbird-91.3.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/cs.xpi -> thunderbird-91.3.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/cy.xpi -> thunderbird-91.3.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/da.xpi -> thunderbird-91.3.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/de.xpi -> thunderbird-91.3.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-91.3.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/el.xpi -> thunderbird-91.3.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-91.3.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-91.3.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-91.3.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-91.3.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/et.xpi -> thunderbird-91.3.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/eu.xpi -> thunderbird-91.3.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/fi.xpi -> thunderbird-91.3.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/fr.xpi -> thunderbird-91.3.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-91.3.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-91.3.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/gd.xpi -> thunderbird-91.3.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/gl.xpi -> thunderbird-91.3.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/he.xpi -> thunderbird-91.3.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/hr.xpi -> thunderbird-91.3.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-91.3.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/hu.xpi -> thunderbird-91.3.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/id.xpi -> thunderbird-91.3.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/is.xpi -> thunderbird-91.3.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/it.xpi -> thunderbird-91.3.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ja.xpi -> thunderbird-91.3.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ka.xpi -> thunderbird-91.3.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/kab.xpi -> thunderbird-91.3.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/kk.xpi -> thunderbird-91.3.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ko.xpi -> thunderbird-91.3.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/lt.xpi -> thunderbird-91.3.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/lv.xpi -> thunderbird-91.3.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ms.xpi -> thunderbird-91.3.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-91.3.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/nl.xpi -> thunderbird-91.3.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-91.3.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-91.3.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pl.xpi -> thunderbird-91.3.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-91.3.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-91.3.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/rm.xpi -> thunderbird-91.3.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ro.xpi -> thunderbird-91.3.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/ru.xpi -> thunderbird-91.3.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sk.xpi -> thunderbird-91.3.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sl.xpi -> thunderbird-91.3.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sq.xpi -> thunderbird-91.3.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sr.xpi -> thunderbird-91.3.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-91.3.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/th.xpi -> thunderbird-91.3.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/tr.xpi -> thunderbird-91.3.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/uk.xpi -> thunderbird-91.3.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/uz.xpi -> thunderbird-91.3.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/vi.xpi -> thunderbird-91.3.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-91.3.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-91.3.2-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=286f432b1ac41f6722091709edb6c25e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index dfd609b0d007..8999e6c47693 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/gmic-2.9.9 b/metadata/md5-cache/media-gfx/gmic-2.9.9
index b6b4b7be8519..820543ad5aef 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.9.9
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.9
@@ -5,11 +5,11 @@ DESCRIPTION=GREYC's Magic Image Converter
 EAPI=8
 HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
 IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 x86
 LICENSE=CeCILL-2 GPL-3
 RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
 REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_2.9.9.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=87c40a68ea26a59f93aa4073991543dd
+_md5_=ce14226ff6119038a39604cf48029f2f
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d182b2f35c16..11c02f3b1f1f 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/gmmlib-21.3.3 b/metadata/md5-cache/media-libs/gmmlib-21.3.3
new file mode 100644
index 000000000000..b3d0273da9b7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gmmlib-21.3.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Intel Graphics Memory Management Library
+EAPI=8
+HOMEPAGE=https://github.com/intel/gmmlib
+IUSE=+custom-cflags test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-21.3.3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e3ccffa4475d7b251ebf9cf71f18e203
diff --git a/metadata/md5-cache/media-libs/mesa-21.3.0_rc3 b/metadata/md5-cache/media-libs/mesa-21.3.0
similarity index 94%
rename from metadata/md5-cache/media-libs/mesa-21.3.0_rc3
rename to metadata/md5-cache/media-libs/mesa-21.3.0
index ae28947d1c33..f7d6afb96e42 100644
--- a/metadata/md5-cache/media-libs/mesa-21.3.0_rc3
+++ b/metadata/md5-cache/media-libs/mesa-21.3.0
@@ -4,13 +4,13 @@ DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_crocus video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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 kernel_linux
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_crocus video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-14:=[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=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
+REQUIRED_USE=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-21.3.0-rc3.tar.xz
+SRC_URI=https://archive.mesa3d.org/mesa-21.3.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93bede7cfae4a897039baa3e2fe1617c
+_md5_=1e8a42fe8c97dbb6f1f06b292e59ced1
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 36afd1992e62..b1a78f33a6f7 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_crocus video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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 kernel_linux
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_crocus video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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 kernel_linux
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-14:=[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=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
+REQUIRED_USE=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93bede7cfae4a897039baa3e2fe1617c
+_md5_=1e8a42fe8c97dbb6f1f06b292e59ced1
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 1f38883441dc..fb5aa11c0019 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/quidscor-1.2.48-r1 b/metadata/md5-cache/net-analyzer/quidscor-1.2.48-r1
deleted file mode 100644
index 552cc12528da..000000000000
--- a/metadata/md5-cache/net-analyzer/quidscor-1.2.48-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-libs/libxml2-2.4 >=net-misc/curl-7.10 >=net-analyzer/snort-2.0
-DESCRIPTION=Qualys IDS Correlation Daemon
-EAPI=5
-HOMEPAGE=http://quidscor.sourceforge.net/
-KEYWORDS=~ppc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/libxml2-2.4 >=net-misc/curl-7.10 >=net-analyzer/snort-2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/quidscor/quidscor-1.2.48-src.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88350d31dfe268c8c9d201e08d4bbe12
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 02808bdb80c6..58d365fecfc0 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2 b/metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2
deleted file mode 100644
index 85f3e6880865..000000000000
--- a/metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!net-dialup/freeradius !net-dialup/gnuradius
-DESCRIPTION=Authentication and accounting server for terminal servers using RADIUS
-EAPI=5
-HOMEPAGE=http://www.radius.cistron.nl/
-KEYWORDS=-* x86
-LICENSE=GPL-2
-RDEPEND=!net-dialup/freeradius !net-dialup/gnuradius
-SLOT=0
-SRC_URI=ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-1.6.8.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e006f3276c3d7ce3ff549ba25a8f9e8
diff --git a/metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1 b/metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1
deleted file mode 100644
index 969b58059e51..000000000000
--- a/metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=An extended getty for the framebuffer console
-EAPI=5
-HOMEPAGE=http://projects.meuh.org/fbgetty/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://projects.meuh.org/fbgetty/downloads/fbgetty-0.1.698.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56
-_md5_=73c5e69d4db0e8b0d7df01972f44ae6d
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index a1452caffdde..867e81accacd 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.1 b/metadata/md5-cache/net-firewall/nftables-1.0.1
new file mode 100644
index 000000000000..2ea828508ef4
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.1:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.1:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
+SLOT=0/1
+SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.1.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e976754e5aaa6f9f39d407164a6de7af
diff --git a/metadata/md5-cache/net-firewall/nftables-9999 b/metadata/md5-cache/net-firewall/nftables-9999
index 7208f05087ff..b3cec68e5b19 100644
--- a/metadata/md5-cache/net-firewall/nftables-9999
+++ b/metadata/md5-cache/net-firewall/nftables-9999
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.1:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
 DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=7
 HOMEPAGE=https://netfilter.org/projects/nftables/
 IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.1:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
 SLOT=0/1
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f94c8569f50d57081c7d452dbcc21f4
+_md5_=e976754e5aaa6f9f39d407164a6de7af
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index ca5da3f50f62..8e803ec47eda 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/openafs-legacy-0.1 b/metadata/md5-cache/net-fs/openafs-legacy-0.1
deleted file mode 100644
index 4233d27d8394..000000000000
--- a/metadata/md5-cache/net-fs/openafs-legacy-0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prerm
-DEPEND=sys-apps/baselayout
-DESCRIPTION=Legacy path symlinks to access FHS-compliant OpenAFS installation
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=net-fs/openafs
-RDEPEND=sys-apps/baselayout
-SLOT=0
-_md5_=65178517c0c928edce5483a52f34c01c
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index d978c1f323aa..504d4063ea8d 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/profxp-3_pre2-r2 b/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
deleted file mode 100644
index 9b06b68f7c24..000000000000
--- a/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Time-HiRes dev-perl/TermReadKey dev-perl/Term-ReadLine-Perl dev-lang/perl:=[-build(-)]
-DESCRIPTION=FXP (server-to-server FTP) commandline client written in Perl
-EAPI=5
-HOMEPAGE=https://duncanthrax.net/profxp/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://duncanthrax.net/profxp/profxp-v3-pre2-src.tar.gz http://search.cpan.org/src/CLINTDW/SOCKS-0.03/lib/Net/SOCKS.pm
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d76ae7a5af190c8e82dd2da6151c30e1
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 813b2ebcfa8e..585560d0a789 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.2.1 b/metadata/md5-cache/net-libs/libnftnl-1.2.1
new file mode 100644
index 000000000000..5b3e278db7fe
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnftnl-1.2.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=net-libs/libmnl-1.0.4:=
+DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=examples static-libs test kernel_linux split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:=
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.1.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=accc2ec24241a78b119dacef4866e8a9
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 4642bdc8e77b..cf2269766be7 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/nxplayer-5.1.24.1-r1 b/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1
index 4685d7746c7a..07de84a5ae47 100644
--- a/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1
+++ b/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1
@@ -4,9 +4,9 @@ EAPI=6
 HOMEPAGE=https://www.nomachine.com
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=nomachine
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:0 || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:0 || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.24_1_i686.tar.gz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d4d980a59fd7222dd5112636c21ae96
+_md5_=ccd98baf69b53a76e6564788b399a323
diff --git a/metadata/md5-cache/net-misc/nxplayer-7.6.2.4 b/metadata/md5-cache/net-misc/nxplayer-7.6.2.4
index c19be4156042..a10fa1a2f53e 100644
--- a/metadata/md5-cache/net-misc/nxplayer-7.6.2.4
+++ b/metadata/md5-cache/net-misc/nxplayer-7.6.2.4
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://www.nomachine.com
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=nomachine
-RDEPEND=|| ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] ) dev-libs/glib:2 dev-libs/openssl:0
+RDEPEND=|| ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] ) dev-libs/glib:2 dev-libs/openssl:0
 SLOT=0
 SRC_URI=amd64? ( http://download.nomachine.com/download/7.6/Linux/nomachine-enterprise-client_7.6.2_4_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/7.6/Linux/nomachine-enterprise-client_7.6.2_4_i686.tar.gz )
-_md5_=f83f000a5a9af9442be6ba1259277861
+_md5_=31205432b25a2cc4dd54c9e593b141b9
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 321f07f91262..bb3e47e1da35 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2
index 308165aa6f03..704f4f947e0b 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=https://resilio.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=acct-group/rslsync acct-user/rslsync || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] ) virtual/tmpfiles
+RDEPEND=acct-group/rslsync acct-user/rslsync || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] ) virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb ) x86? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_i386.deb )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=4c907981d6c065330986c80518b36170
+_md5_=78e977dcd1599713d947501318bd3974
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f96a467c339f..1797227426e5 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/mdk-3.6-r1 b/metadata/md5-cache/net-wireless/mdk-3.6-r1
index 8fb12a9cd421..557f58f6c5ca 100644
--- a/metadata/md5-cache/net-wireless/mdk-3.6-r1
+++ b/metadata/md5-cache/net-wireless/mdk-3.6-r1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk3-v6.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a92e0326af55d8e743cce82e0971b1e7
+_md5_=3ded2f447c9442dbe6ba652dc543a9d2
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index b53583ba990a..8afb5ca048b1 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2 b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
deleted file mode 100644
index 4c49d0b1e78c..000000000000
--- a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch postinst pretend
-DESCRIPTION=Full-featured EDA product for altera devices
-EAPI=5
-HOMEPAGE=https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html
-KEYWORDS=~amd64 ~x86
-LICENSE=Quartus-prime-megacore
-RDEPEND=media-libs/libpng-compat:1.2
-RESTRICT=fetch bindist
-SLOT=0
-SRC_URI=Quartus-lite-15.1.0.185-linux.tar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=f2075fffc6735dafe0f4ee7a14487b58
diff --git a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3 b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
deleted file mode 100644
index 08250e1e2159..000000000000
--- a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install nofetch postinst pretend
-DESCRIPTION=Full-featured EDA product for altera devices
-EAPI=6
-HOMEPAGE=https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html
-LICENSE=Quartus-prime-megacore
-RDEPEND=media-libs/libpng-compat:1.2[abi_x86_32] x11-libs/libXft[abi_x86_32] app-arch/bzip2[abi_x86_32] sys-libs/zlib[abi_x86_32] sys-libs/glibc[multilib]
-RESTRICT=fetch bindist
-SLOT=0
-SRC_URI=Quartus-lite-15.1.0.185-linux.tar https://github.com/brendanhoran/gentoo-custom/raw/master/files/libfreetype.so.6
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56
-_md5_=74217b19c6ebb20e90d6bff8fe1f028d
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index cbb986e484d5..7465c39ba4be 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/harmonics-dwf-free-noncomm-20111230-r1 b/metadata/md5-cache/sci-geosciences/harmonics-dwf-free-noncomm-20111230-r1
deleted file mode 100644
index 14cdb1f09c68..000000000000
--- a/metadata/md5-cache/sci-geosciences/harmonics-dwf-free-noncomm-20111230-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tidal harmonics database for libtcd
-EAPI=5
-HOMEPAGE=http://www.flaterco.com/xtide/
-KEYWORDS=amd64 x86
-LICENSE=free-noncomm
-SLOT=0
-SRC_URI=ftp://ftp.flaterco.com/xtide/harmonics-dwf-20111230-nonfree.tar.bz2
-_md5_=5a29e22d681ee3cedeeeea7d5845280d
diff --git a/metadata/md5-cache/sci-geosciences/swmm-5.0.022 b/metadata/md5-cache/sci-geosciences/swmm-5.0.022
deleted file mode 100644
index da741f0da8d4..000000000000
--- a/metadata/md5-cache/sci-geosciences/swmm-5.0.022
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Storm Water Management Model-SWMM, hydrology, hydraulics, water quality model
-EAPI=5
-HOMEPAGE=http://www.epa.gov/ednnrmrl/models/swmm/index.htm
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.epa.gov/nrmrl/wswrd/wq/models/swmm/swmm50022_engine.zip
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=815b0eda4359e77daecfce66757eb35e
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 8bc6ae35b49f..f078a0d514f9 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/pastix-6.0.3 b/metadata/md5-cache/sci-libs/pastix-6.0.3
index 686fccd74bc7..41be87e90de5 100644
--- a/metadata/md5-cache/sci-libs/pastix-6.0.3
+++ b/metadata/md5-cache/sci-libs/pastix-6.0.3
@@ -5,7 +5,7 @@ DESCRIPTION=Parallel solver for very large sparse linear systems
 EAPI=7
 HOMEPAGE=https://pastix.gforge.inria.fr
 IUSE=cuda examples +fortran int64 metis mpi +python +scotch starpu test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-C
 RDEPEND=sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) virtual/fortran
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( metis scotch )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/38205/pastix-6.0.3.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=2b8385258cca28bd6d127d13c0ff0093
+_md5_=ee56bf0b0af4f5717590faccaa870e00
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 96dcccd132ea..8e00cc11025b 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/busybox-1.34.1 b/metadata/md5-cache/sys-apps/busybox-1.34.1
index c814e00738e6..d9900be04d10 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.34.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.34.1
@@ -5,7 +5,7 @@ DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=7
 HOMEPAGE=https://www.busybox.net/
 IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= !static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam )
 REQUIRED_USE=pam? ( !static )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0230b790f823c0d8e6cc3ae46aba7dc7
+_md5_=f358a25ca08a6c6334c094c6c6589808
diff --git a/metadata/md5-cache/sys-apps/cpuid-20211031 b/metadata/md5-cache/sys-apps/cpuid-20211114
similarity index 85%
rename from metadata/md5-cache/sys-apps/cpuid-20211031
rename to metadata/md5-cache/sys-apps/cpuid-20211114
index 750ee61a1050..4dc7edaee2d3 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20211031
+++ b/metadata/md5-cache/sys-apps/cpuid-20211114
@@ -6,6 +6,6 @@ HOMEPAGE=http://www.etallen.com/cpuid.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://www.etallen.com/cpuid/cpuid-20211031.src.tar.gz
+SRC_URI=http://www.etallen.com/cpuid/cpuid-20211114.src.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a6d553512f92777cdb1b0fc283b31b0
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 7f5625b521cb..8c89cacca5a5 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.94.0 b/metadata/md5-cache/sys-auth/fprintd-1.94.0
index 09bbff9237bb..dc89e6fb9b7c 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.94.0
+++ b/metadata/md5-cache/sys-auth/fprintd-1.94.0
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus service to access fingerprint readers
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/libfprint/fprintd
 IUSE=doc pam systemd test
-KEYWORDS=~amd64 ~arm ~ia64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.94.0/fprintd-v1.94.0.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0eb9ecd20f0c1aef4a91694f12d3c99d
+_md5_=a1e4ca72f0074a55d3d6304d3ddcf9b3
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.94.1-r1 b/metadata/md5-cache/sys-auth/libfprint-1.94.1-r1
index 7e81ffe1bb62..f1dcbefafa6d 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.94.1-r1
+++ b/metadata/md5-cache/sys-auth/libfprint-1.94.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library to add support for consumer fingerprint readers
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint
 IUSE=examples gtk-doc +introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXv x11-libs/pixman !>=sys-auth/libfprint-1.90:0
 SLOT=2
 SRC_URI=https://github.com/freedesktop/libfprint/archive/refs/tags/v1.94.1.tar.gz -> libfprint-1.94.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=37d3a5ced6cd2c0f1eb2770ad5f808a4
+_md5_=b2e6b0395d1a613f87a4e06f02fea5a6
diff --git a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0 b/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
deleted file mode 100644
index 64f15afc42f8..000000000000
--- a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-apps/pcsc-lite sys-apps/help2man dev-util/gengetopt virtual/pkgconfig
-DESCRIPTION=Tools for Yubico's YubiKey NEO in CCID mode
-EAPI=5
-HOMEPAGE=https://github.com/Yubico/ykneo-ccid-tools
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-apps/pcsc-lite
-SLOT=0
-SRC_URI=http://yubico.github.io/ykneo-ccid-tools/releases/ykneo-ccid-tools-0.0.0.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=0dd84bb60be8e256a9e29b26bddc55a0
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 2a28761aceff..d2a661b806b5 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1 b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
index d9a95994a0b9..e724ad897aec 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for bcache
 EAPI=7
 HOMEPAGE=https://bcache.evilpiepirate.org/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/util-linux virtual/udev
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-1.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73f02d3f9253d8b471dcd5eb84883334
+_md5_=63e4852763b7bdad23e6e8c334745091
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.12.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.14.0
similarity index 69%
rename from metadata/md5-cache/sys-fs/xfsprogs-5.12.0
rename to metadata/md5-cache/sys-fs/xfsprogs-5.14.0
index 8ae536a92ad6..f381fb762fdc 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.12.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.14.0
@@ -1,14 +1,14 @@
 BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
+DEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih dev-libs/userspace-rcu icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
 DESCRIPTION=xfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
 IUSE=icu libedit nls split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
+RDEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih dev-libs/userspace-rcu icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.12.0.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.14.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dacd7b58b812ba03c6f531259f13e856
+_md5_=e683bb38c65c79d8df07780211d785d9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 33037805cf73..9328ab53d6d1 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.68 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.68
deleted file mode 100644
index fd7f456d5587..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.68
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.68
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.68
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-74.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9e59e4e2d4687aad466a02d5e55a887
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.75 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.75
deleted file mode 100644
index 4486d1f444f4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.75
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.75
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.75
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce15cd977f0dcdc5881eff7cb859167a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.76 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.76
deleted file mode 100644
index ef7e5567626c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.76
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.76
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.76 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.76
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-82.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-82.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe724da7ac2106a71e89402fa7cee0ad
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.77 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.77
deleted file mode 100644
index a600d44a0b0a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.77
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.77
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.77 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.77
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-84.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bd70ef96248199a661875fd3a19eb4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.78 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.78
index cdcd1a1f1e33..46185ae2afaf 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.78
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.78
@@ -4,7 +4,7 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.78
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.78 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.78
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-85.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-85.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=619ea4d58928c13f6e123d58ff371e70
+_md5_=b96ec627d171da130365882a4829c539
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.79 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.79
deleted file mode 100644
index 226532b6eda8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.79
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.79
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.79 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.79
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-86.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-86.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bd70ef96248199a661875fd3a19eb4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.14
deleted file mode 100644
index 10c72a998487..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.14
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88a0228ae13ac193f37e4fc3a82245f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.15
deleted file mode 100644
index 57cc29664742..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.15
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-16.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d58045360c9a05b31b856948744b30d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.16
deleted file mode 100644
index 036169a59b19..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.16
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-17.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d58045360c9a05b31b856948744b30d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.17
deleted file mode 100644
index f8c703e340d6..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.17
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-19.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a9bbbf91b81687383e4c4e0686efc85d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.18
deleted file mode 100644
index f89526ea5b06..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.18
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-20.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a9bbbf91b81687383e4c4e0686efc85d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.19
deleted file mode 100644
index 0b941d12fc02..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.19
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.19
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-21.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-21.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=04f1f36b29b01caf9432fed8db952193
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.1
deleted file mode 100644
index 259fcfeaf1fa..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.1
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-3.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.0 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2159b5e807c8ab89739f20de6b162fd0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.2
deleted file mode 100644
index c6621902608f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.2
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-4.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.0 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2159b5e807c8ab89739f20de6b162fd0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.148 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.148
deleted file mode 100644
index 8e879847bbe7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.148
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.148
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.148 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.148
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-152.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-152.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b186dfc4c1585348ee7ca5f08b1d988
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.155 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.155
deleted file mode 100644
index 43bdd00b33c6..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.155
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.155
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.155 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.155
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad0f8600b4567027614d7bd9aa0f6a1b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.156 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.156
deleted file mode 100644
index d37b1ffbac9e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.156
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.156
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.156 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.156
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=304627db267cb8d5c02510a10736152b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.157 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.157
deleted file mode 100644
index 37b4f6cb2f88..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.157
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.157
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.157 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.157
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-161.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-161.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=304627db267cb8d5c02510a10736152b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.158 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.158
index 70f918487fdb..291cf2527304 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.158
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.158
@@ -4,7 +4,7 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.158
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.158 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.158
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-162.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-162.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad0f8600b4567027614d7bd9aa0f6a1b
+_md5_=860e976b62a219696f01286dc8c18aea
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.159 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.159
deleted file mode 100644
index cbb05d5319be..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.159
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.159
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.159 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.159
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-163.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-163.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=304627db267cb8d5c02510a10736152b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.68 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.68
deleted file mode 100644
index 999a7fa91366..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.68
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.68
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.68
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-74.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68-1.xpak -> gentoo-kernel-5.10.68-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68-1.xpak -> gentoo-kernel-5.10.68-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b34be6dfb4fecca89f128cf564b7f23
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.68-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.68-r1
deleted file mode 100644
index 4bdf65c1c9a3..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.68-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.68
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.68
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-74.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68-1.xpak -> gentoo-kernel-5.10.68-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c5ea71ea4f24a61e4da62a811d662495
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75
deleted file mode 100644
index de4a1a42fc92..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.75
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.75
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75-1.xpak -> gentoo-kernel-5.10.75-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75-1.xpak -> gentoo-kernel-5.10.75-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51ee06b73cd59d27817ae0b29438fdc0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75-r1
deleted file mode 100644
index 268c31ce7466..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.75
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.75
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75-1.xpak -> gentoo-kernel-5.10.75-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c5ea71ea4f24a61e4da62a811d662495
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.76 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.76
deleted file mode 100644
index aeedbbfa1b22..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.76
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.76
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.76 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.76
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-82.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-82.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.76-1.xpak -> gentoo-kernel-5.10.76-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.76-1.xpak -> gentoo-kernel-5.10.76-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.76-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.76-r1
deleted file mode 100644
index 7827a2ee7acd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.76-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.76
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.76 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.76
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-82.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-82.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.76-1.xpak -> gentoo-kernel-5.10.76-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.77 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.77
deleted file mode 100644
index 12641c0cbe28..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.77
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.77
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.77 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.77
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-84.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.77-1.xpak -> gentoo-kernel-5.10.77-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.77-1.xpak -> gentoo-kernel-5.10.77-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d6f526465af45a5d2aabd0bcb74eda1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.77-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.77-r2
deleted file mode 100644
index 90b78f549e62..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.77-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.77
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.77 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.77
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-84.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.77-1.xpak -> gentoo-kernel-5.10.77-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a329a6e60e972f63e113723ab0f28316
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.78 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.78
index 0c2fac6559b2..35f16662cf8b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.78
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.78
@@ -4,7 +4,7 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.78
 RDEPEND=!sys-kernel/gentoo-kernel:5.10.78 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.78
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-85.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-85.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.78-1.xpak -> gentoo-kernel-5.10.78-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.78-1.xpak -> gentoo-kernel-5.10.78-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b25e950f118cdb0532cf693efa2dd206
+_md5_=ef42008c51d7365c5a175d437e2f06e2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.79 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.79
deleted file mode 100644
index 13aad815206c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.79
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.79
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.79 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.79
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-86.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-86.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.79-1.xpak -> gentoo-kernel-5.10.79-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.79-1.xpak -> gentoo-kernel-5.10.79-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d6f526465af45a5d2aabd0bcb74eda1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.79-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.79-r1
deleted file mode 100644
index 4b3a09d1dca7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.79-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.79
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.79 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.79
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-86.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-86.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.79-1.xpak -> gentoo-kernel-5.10.79-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a329a6e60e972f63e113723ab0f28316
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14
deleted file mode 100644
index 9b17bb1a2b87..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.14
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14-1.xpak -> gentoo-kernel-5.14.14-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14-1.xpak -> gentoo-kernel-5.14.14-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14-r1
deleted file mode 100644
index 58d9a49a0bf7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.14
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14-1.xpak -> gentoo-kernel-5.14.14-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f429b3df382c51ad556ccb4307fe9c6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.15
deleted file mode 100644
index ebd63f515dcb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.15
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-16.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15-1.xpak -> gentoo-kernel-5.14.15-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15-1.xpak -> gentoo-kernel-5.14.15-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.15-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.15-r1
deleted file mode 100644
index 5e2b96eaf926..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.15-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.15
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-16.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15-1.xpak -> gentoo-kernel-5.14.15-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f429b3df382c51ad556ccb4307fe9c6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.16
deleted file mode 100644
index 76297876565b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.16
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-17.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16-1.xpak -> gentoo-kernel-5.14.16-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16-1.xpak -> gentoo-kernel-5.14.16-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.16-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.16-r1
deleted file mode 100644
index 090aef5bc176..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.16-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.16
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-17.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16-1.xpak -> gentoo-kernel-5.14.16-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f429b3df382c51ad556ccb4307fe9c6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.17
deleted file mode 100644
index 2665339ce0a9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.17
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-19.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.17-1.xpak -> gentoo-kernel-5.14.17-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.17-1.xpak -> gentoo-kernel-5.14.17-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.17-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.17-r1
deleted file mode 100644
index 1f31a0373410..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.17
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-19.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.17-1.xpak -> gentoo-kernel-5.14.17-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8f72c850c11a2b027167121ccee67765
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.18
deleted file mode 100644
index bfa41d1da1cf..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.18
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-20.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18-1.xpak -> gentoo-kernel-5.14.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18-1.xpak -> gentoo-kernel-5.14.18-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.18-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.18-r1
deleted file mode 100644
index 3076710cc5a7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.18-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.18
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-20.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18-1.xpak -> gentoo-kernel-5.14.18-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8f72c850c11a2b027167121ccee67765
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.19
deleted file mode 100644
index 96ed3d97ac5e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.19
-RDEPEND=!sys-kernel/gentoo-kernel:5.14.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.19
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-21.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-21.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.19-1.xpak -> gentoo-kernel-5.14.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.19-1.xpak -> gentoo-kernel-5.14.19-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.1
deleted file mode 100644
index d05cd60ea4b4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.1
-RDEPEND=!sys-kernel/gentoo-kernel:5.15.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-3.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.1-1.xpak -> gentoo-kernel-5.15.1-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.1-1.xpak -> gentoo-kernel-5.15.1-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.2
deleted file mode 100644
index 4d63f0e853c5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.2
-RDEPEND=!sys-kernel/gentoo-kernel:5.15.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-4.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.2-1.xpak -> gentoo-kernel-5.15.2-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.2-1.xpak -> gentoo-kernel-5.15.2-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.148 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.148
deleted file mode 100644
index 38d80b2a57b9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.148
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.148
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.148 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.148
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-152.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-152.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.148-1.xpak -> gentoo-kernel-5.4.148-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.148-1.xpak -> gentoo-kernel-5.4.148-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=835c5eedf1b9827ca8bd0652f5452449
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.148-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.148-r1
deleted file mode 100644
index 75700c2588a8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.148-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.148
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.148 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.148
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-152.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-152.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.148-1.xpak -> gentoo-kernel-5.4.148-1.arm64-r1.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e9e0ae5386ff8723ef6fbdac370a0a9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155
deleted file mode 100644
index 79f028700ca1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.155
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.155 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.155
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155-1.xpak -> gentoo-kernel-5.4.155-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155-1.xpak -> gentoo-kernel-5.4.155-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=79d56e5b609caaefa72072a38fb7ae6b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155-r1
deleted file mode 100644
index 563f785d1089..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.155
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.155 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.155
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155-1.xpak -> gentoo-kernel-5.4.155-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4de39c10fcc53015baa4f84c2dea48f9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.156 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.156
deleted file mode 100644
index 77c6e5a5a52d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.156
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.156
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.156 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.156
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.156-1.xpak -> gentoo-kernel-5.4.156-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.156-1.xpak -> gentoo-kernel-5.4.156-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.156-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.156-r1
deleted file mode 100644
index b49d70f0b265..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.156-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.156
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.156 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.156
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.156-1.xpak -> gentoo-kernel-5.4.156-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.157 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.157
deleted file mode 100644
index 58049d2822e1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.157
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.157
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.157 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.157
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-161.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-161.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.157-1.xpak -> gentoo-kernel-5.4.157-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.157-1.xpak -> gentoo-kernel-5.4.157-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.157-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.157-r1
deleted file mode 100644
index 23d7eec2e670..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.157-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.157
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.157 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.157
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-161.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-161.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.157-1.xpak -> gentoo-kernel-5.4.157-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.158 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.158
index d297ac506616..a0e4c75a98f8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.158
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.158
@@ -4,7 +4,7 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.158
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.158 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.158
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-162.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-162.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158-1.xpak -> gentoo-kernel-5.4.158-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158-1.xpak -> gentoo-kernel-5.4.158-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=79d56e5b609caaefa72072a38fb7ae6b
+_md5_=835c5eedf1b9827ca8bd0652f5452449
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.159 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.159
deleted file mode 100644
index cde228bd5c9d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.159
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.159
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.159 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.159
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-163.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-163.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.159-1.xpak -> gentoo-kernel-5.4.159-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.159-1.xpak -> gentoo-kernel-5.4.159-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.159-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.159-r1
deleted file mode 100644
index 1a725a63d4b5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.159-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.159
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.159 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.159
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-163.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-163.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.159-1.xpak -> gentoo-kernel-5.4.159-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.68 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.68
deleted file mode 100644
index 413258dd0b8f..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.68
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.68
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.68
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.68.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.68.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.75 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.75
deleted file mode 100644
index 02f0811a0cbb..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.75
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.75
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.75
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.75.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.75.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.76 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.76
deleted file mode 100644
index 017e8979ccd7..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.76
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.76
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.76 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.76
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.76.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.76.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.77 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.77
deleted file mode 100644
index aa4d2f12bfd3..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.77
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.77
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.77 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.77
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.77.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.77.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.79 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.79
deleted file mode 100644
index e965828bd837..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.79
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.79
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.79 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.79
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.79.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.79.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.14 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.14
deleted file mode 100644
index 0fdfed22438b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.14
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.14.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.14.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.15 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.15
deleted file mode 100644
index 6d74392703b7..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.15
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.15.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.15.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=3acae1f25109b92db2d01bdc8435547e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.16
deleted file mode 100644
index bd305c1e3938..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.16
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.16.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.16.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=3acae1f25109b92db2d01bdc8435547e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.17
deleted file mode 100644
index 2b45aaf2b5e4..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.17
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.17.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.17.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=3acae1f25109b92db2d01bdc8435547e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.18
deleted file mode 100644
index 03d2ebe6d28d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.18
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.18.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.18.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=3acae1f25109b92db2d01bdc8435547e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.19
deleted file mode 100644
index 77ed1498e938..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.14.19
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.14.19
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.19.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.19.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.14 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.14 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.14 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/072218102fd9274725c08fe0686fa387ddf02371/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.14 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=123e461acf0c65bbf999599618d0f0ce
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.1 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.1
deleted file mode 100644
index 61af07231a0e..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.1
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.15.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.1.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.1.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.0 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=032398c9709e8a83720c195d1a9a069d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.2 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.2
deleted file mode 100644
index ac27190b7ff8..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.15.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.2.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.2.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ac22a7ccb1707c38a74189c47fc991414cc01bca/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.0 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=032398c9709e8a83720c195d1a9a069d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.148 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.148
deleted file mode 100644
index 3216a05aea2c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.148
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.148
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.148 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.148
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.148.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.148.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.155 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.155
deleted file mode 100644
index 21142e6bfbd4..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.155
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.155
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.155 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.155
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.155.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.155.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=dfc72b59d8c98ba8b75b6f1d51fa33a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.156 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.156
deleted file mode 100644
index f788752a45e5..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.156
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.156
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.156 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.156
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.156.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.156.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=dfc72b59d8c98ba8b75b6f1d51fa33a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.157 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.157
deleted file mode 100644
index 483a0a0ffe22..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.157
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.157
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.157 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.157
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.157.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.157.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=dfc72b59d8c98ba8b75b6f1d51fa33a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.159 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.159
deleted file mode 100644
index b4d4464c14b1..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.159
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.159
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.159 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.159
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.159.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.159.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=dfc72b59d8c98ba8b75b6f1d51fa33a8
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 09ca913f16a9..54953a0a536e 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/libxcrypt-4.4.25 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.25-r1
similarity index 97%
rename from metadata/md5-cache/sys-libs/libxcrypt-4.4.25
rename to metadata/md5-cache/sys-libs/libxcrypt-4.4.25-r1
index 063688630eb8..fc1420c2d509 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.25
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.25-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.25-autotools.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7e08975b6b41031ddb2af8c403cfac39
+_md5_=9f721cc51174fe0621d3bfaaa672dd15
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.26 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.26-r1
similarity index 97%
rename from metadata/md5-cache/sys-libs/libxcrypt-4.4.26
rename to metadata/md5-cache/sys-libs/libxcrypt-4.4.26-r1
index 9afd1cf84c79..9d4bda159710 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.26
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.26-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.26-autotools.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=654d8d5831404310c3e9f2c1f26b9d61
+_md5_=de4840aea49398e9741391aa81db91e1
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 704fd12d9fd5..645ebda8977d 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/dist-kernel-5.10.68 b/metadata/md5-cache/virtual/dist-kernel-5.10.68
deleted file mode 100644
index f4c065b7d0e2..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.68
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.68 ~sys-kernel/gentoo-kernel-bin-5.10.68 ~sys-kernel/vanilla-kernel-5.10.68 )
-SLOT=0/5.10.68
-_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.75 b/metadata/md5-cache/virtual/dist-kernel-5.10.75
deleted file mode 100644
index b4df7104fa50..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.75
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.75 ~sys-kernel/gentoo-kernel-bin-5.10.75 ~sys-kernel/vanilla-kernel-5.10.75 )
-SLOT=0/5.10.75
-_md5_=6b09e35a221b55e3724af701f8242cc1
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.76 b/metadata/md5-cache/virtual/dist-kernel-5.10.76
deleted file mode 100644
index a0ae9360895c..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.76
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.76 ~sys-kernel/gentoo-kernel-bin-5.10.76 ~sys-kernel/vanilla-kernel-5.10.76 )
-SLOT=0/5.10.76
-_md5_=3c8f423a93a67dff00cfa7548459db74
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.77 b/metadata/md5-cache/virtual/dist-kernel-5.10.77
deleted file mode 100644
index e2e23901d129..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.77
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.77 ~sys-kernel/gentoo-kernel-bin-5.10.77 ~sys-kernel/vanilla-kernel-5.10.77 )
-SLOT=0/5.10.77
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.78 b/metadata/md5-cache/virtual/dist-kernel-5.10.78
index e28077c7b096..215b9689a75d 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.78
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.78
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.78 ~sys-kernel/gentoo-kernel-bin-5.10.78 ~sys-kernel/vanilla-kernel-5.10.78 )
 SLOT=0/5.10.78
-_md5_=6b09e35a221b55e3724af701f8242cc1
+_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.79 b/metadata/md5-cache/virtual/dist-kernel-5.10.79
deleted file mode 100644
index d2d1336008d2..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.79
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.79 ~sys-kernel/gentoo-kernel-bin-5.10.79 ~sys-kernel/vanilla-kernel-5.10.79 )
-SLOT=0/5.10.79
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.14 b/metadata/md5-cache/virtual/dist-kernel-5.14.14
deleted file mode 100644
index e869bf6c15f7..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.14.14
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.14 ~sys-kernel/gentoo-kernel-bin-5.14.14 ~sys-kernel/vanilla-kernel-5.14.14 )
-SLOT=0/5.14.14
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.15 b/metadata/md5-cache/virtual/dist-kernel-5.14.15
deleted file mode 100644
index d19f1d766084..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.14.15
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.15 ~sys-kernel/gentoo-kernel-bin-5.14.15 ~sys-kernel/vanilla-kernel-5.14.15 )
-SLOT=0/5.14.15
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.16 b/metadata/md5-cache/virtual/dist-kernel-5.14.16
deleted file mode 100644
index f82c1020166a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.14.16
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.16 ~sys-kernel/gentoo-kernel-bin-5.14.16 ~sys-kernel/vanilla-kernel-5.14.16 )
-SLOT=0/5.14.16
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.17 b/metadata/md5-cache/virtual/dist-kernel-5.14.17
deleted file mode 100644
index 3eda79724221..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.14.17
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.17 ~sys-kernel/gentoo-kernel-bin-5.14.17 ~sys-kernel/vanilla-kernel-5.14.17 )
-SLOT=0/5.14.17
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.18 b/metadata/md5-cache/virtual/dist-kernel-5.14.18
deleted file mode 100644
index c723e6014b75..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.14.18
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.18 ~sys-kernel/gentoo-kernel-bin-5.14.18 ~sys-kernel/vanilla-kernel-5.14.18 )
-SLOT=0/5.14.18
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.19 b/metadata/md5-cache/virtual/dist-kernel-5.14.19
deleted file mode 100644
index 2035c2d5cd55..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.14.19
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.19 ~sys-kernel/gentoo-kernel-bin-5.14.19 ~sys-kernel/vanilla-kernel-5.14.19 )
-SLOT=0/5.14.19
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.1 b/metadata/md5-cache/virtual/dist-kernel-5.15.1
deleted file mode 100644
index 4aedbd7e7d54..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.1 ~sys-kernel/gentoo-kernel-bin-5.15.1 ~sys-kernel/vanilla-kernel-5.15.1 )
-SLOT=0/5.15.1
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.2 b/metadata/md5-cache/virtual/dist-kernel-5.15.2
deleted file mode 100644
index b02268bd3ef9..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.2 ~sys-kernel/gentoo-kernel-bin-5.15.2 ~sys-kernel/vanilla-kernel-5.15.2 )
-SLOT=0/5.15.2
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.148 b/metadata/md5-cache/virtual/dist-kernel-5.4.148
deleted file mode 100644
index e451eef0bdc0..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.148
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 arm64 ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.148 ~sys-kernel/gentoo-kernel-bin-5.4.148 ~sys-kernel/vanilla-kernel-5.4.148 )
-SLOT=0/5.4.148
-_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.155 b/metadata/md5-cache/virtual/dist-kernel-5.4.155
deleted file mode 100644
index 86d877d197e0..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.155
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 arm64 ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.155 ~sys-kernel/gentoo-kernel-bin-5.4.155 ~sys-kernel/vanilla-kernel-5.4.155 )
-SLOT=0/5.4.155
-_md5_=8fd751f8b295f6282d75a64b75954d2f
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.156 b/metadata/md5-cache/virtual/dist-kernel-5.4.156
deleted file mode 100644
index 4b08f37f440c..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.156
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.156 ~sys-kernel/gentoo-kernel-bin-5.4.156 ~sys-kernel/vanilla-kernel-5.4.156 )
-SLOT=0/5.4.156
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.157 b/metadata/md5-cache/virtual/dist-kernel-5.4.157
deleted file mode 100644
index a642885dbbe4..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.157
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.157 ~sys-kernel/gentoo-kernel-bin-5.4.157 ~sys-kernel/vanilla-kernel-5.4.157 )
-SLOT=0/5.4.157
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.158 b/metadata/md5-cache/virtual/dist-kernel-5.4.158
index 9c2336decb7b..bac9da0ffa67 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.158
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.158
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=amd64 arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.158 ~sys-kernel/gentoo-kernel-bin-5.4.158 ~sys-kernel/vanilla-kernel-5.4.158 )
 SLOT=0/5.4.158
-_md5_=8fd751f8b295f6282d75a64b75954d2f
+_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.159 b/metadata/md5-cache/virtual/dist-kernel-5.4.159
deleted file mode 100644
index a8e98f901062..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.159
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.159 ~sys-kernel/gentoo-kernel-bin-5.4.159 ~sys-kernel/vanilla-kernel-5.4.159 )
-SLOT=0/5.4.159
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 45bf68480472..1e0df095b973 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/firefox-94.0.2 b/metadata/md5-cache/www-client/firefox-94.0.2
new file mode 100644
index 000000000000..af6c5e8ded62
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-94.0.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.71 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh kernel_linux pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.71 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) wifi? ( dbus ) screencast? ( wayland )
+SLOT=0/94
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/94.0.2/source/firefox-94.0.2.source.tar.xz -> firefox-94.0.2.source.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-94-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-94-patches-02.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/af.xpi -> firefox-94.0.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ar.xpi -> firefox-94.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ast.xpi -> firefox-94.0.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/be.xpi -> firefox-94.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/bg.xpi -> firefox-94.0.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/br.xpi -> firefox-94.0.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ca.xpi -> firefox-94.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/cak.xpi -> firefox-94.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/cs.xpi -> firefox-94.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/cy.xpi -> firefox-94.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/da.xpi -> firefox-94.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/de.xpi -> firefox-94.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-94.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/el.xpi -> firefox-94.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-94.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-94.0.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-94.0.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-94.0.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/et.xpi -> firefox-94.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/eu.xpi -> firefox-94.0.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fi.xpi -> firefox-94.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fr.xpi -> firefox-94.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-94.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-94.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gd.xpi -> firefox-94.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gl.xpi -> firefox-94.0.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/he.xpi -> firefox-94.0.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hr.xpi -> firefox-94.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-94.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hu.xpi -> firefox-94.0.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/id.xpi -> firefox-94.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/is.xpi -> firefox-94.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/it.xpi -> firefox-94.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ja.xpi -> firefox-94.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ka.xpi -> firefox-94.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/kab.xpi -> firefox-94.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/kk.xpi -> firefox-94.0.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ko.xpi -> firefox-94.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/lt.xpi -> firefox-94.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/lv.xpi -> firefox-94.0.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ms.xpi -> firefox-94.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-94.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/nl.xpi -> firefox-94.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-94.0.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-94.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pl.xpi -> firefox-94.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-94.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-94.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/rm.xpi -> firefox-94.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ro.xpi -> firefox-94.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ru.xpi -> firefox-94.0.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sk.xpi -> firefox-94.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sl.xpi -> firefox-94.0.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sq.xpi -> firefox-94.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sr.xpi -> firefox-94.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-94.0.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/th.xpi -> firefox-94.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/tr.xpi -> firefox-94.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/uk.xpi -> firefox-94.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/uz.xpi -> firefox-94.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/vi.xpi -> firefox-94.0.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-94.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-94.0.2-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ach.xpi -> firefox-94.0.2-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/an.xpi -> firefox-94.0.2-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/az.xpi -> firefox-94.0.2-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/bn.xpi -> firefox-94.0.2-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/bs.xpi -> firefox-94.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-94.0.2-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/eo.xpi -> firefox-94.0.2-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-94.0.2-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-94.0.2-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fa.xpi -> firefox-94.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ff.xpi -> firefox-94.0.2-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gn.xpi -> firefox-94.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-94.0.2-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-94.0.2-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-94.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ia.xpi -> firefox-94.0.2-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/km.xpi -> firefox-94.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/kn.xpi -> firefox-94.0.2-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/lij.xpi -> firefox-94.0.2-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/mk.xpi -> firefox-94.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/mr.xpi -> firefox-94.0.2-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/my.xpi -> firefox-94.0.2-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-94.0.2-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/oc.xpi -> firefox-94.0.2-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sco.xpi -> firefox-94.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/si.xpi -> firefox-94.0.2-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/son.xpi -> firefox-94.0.2-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/szl.xpi -> firefox-94.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ta.xpi -> firefox-94.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/te.xpi -> firefox-94.0.2-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/tl.xpi -> firefox-94.0.2-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/trs.xpi -> firefox-94.0.2-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ur.xpi -> firefox-94.0.2-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/xh.xpi -> firefox-94.0.2-xh.xpi )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=c0db982bf8ce0deb3ffc2a54cd2ee919
diff --git a/metadata/md5-cache/www-client/firefox-bin-94.0.2 b/metadata/md5-cache/www-client/firefox-bin-94.0.2
new file mode 100644
index 000000000000..5e11a252429c
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-94.0.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/94
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/en-US/firefox-94.0.2.tar.bz2 -> firefox-bin_x86_64-94.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-i686/en-US/firefox-94.0.2.tar.bz2 -> firefox-bin_i686-94.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ach.xpi -> firefox-94.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/af.xpi -> firefox-94.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/an.xpi -> firefox-94.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ar.xpi -> firefox-94.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ast.xpi -> firefox-94.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/az.xpi -> firefox-94.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/be.xpi -> firefox-94.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/bg.xpi -> firefox-94.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/bn.xpi -> firefox-94.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/br.xpi -> firefox-94.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/bs.xpi -> firefox-94.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-94.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ca.xpi -> firefox-94.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/cak.xpi -> firefox-94.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/cs.xpi -> firefox-94.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/cy.xpi -> firefox-94.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/da.xpi -> firefox-94.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/de.xpi -> firefox-94.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-94.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/el.xpi -> firefox-94.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-94.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-94.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/eo.xpi -> firefox-94.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-94.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-94.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-94.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-94.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/et.xpi -> firefox-94.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/eu.xpi -> firefox-94.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fa.xpi -> firefox-94.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ff.xpi -> firefox-94.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fi.xpi -> firefox-94.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fr.xpi -> firefox-94.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-94.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-94.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gd.xpi -> firefox-94.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gl.xpi -> firefox-94.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gn.xpi -> firefox-94.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-94.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/he.xpi -> firefox-94.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-94.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hr.xpi -> firefox-94.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-94.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hu.xpi -> firefox-94.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-94.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ia.xpi -> firefox-94.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/id.xpi -> firefox-94.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/is.xpi -> firefox-94.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/it.xpi -> firefox-94.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ja.xpi -> firefox-94.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ka.xpi -> firefox-94.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/kab.xpi -> firefox-94.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/kk.xpi -> firefox-94.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/km.xpi -> firefox-94.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/kn.xpi -> firefox-94.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ko.xpi -> firefox-94.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/lij.xpi -> firefox-94.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/lt.xpi -> firefox-94.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/lv.xpi -> firefox-94.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/mk.xpi -> firefox-94.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/mr.xpi -> firefox-94.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ms.xpi -> firefox-94.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/my.xpi -> firefox-94.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-94.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-94.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/nl.xpi -> firefox-94.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-94.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/oc.xpi -> firefox-94.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-94.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pl.xpi -> firefox-94.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-94.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-94.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/rm.xpi -> firefox-94.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ro.xpi -> firefox-94.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ru.xpi -> firefox-94.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/si.xpi -> firefox-94.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sk.xpi -> firefox-94.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sl.xpi -> firefox-94.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/son.xpi -> firefox-94.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sq.xpi -> firefox-94.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sr.xpi -> firefox-94.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-94.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ta.xpi -> firefox-94.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/te.xpi -> firefox-94.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/th.xpi -> firefox-94.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/tl.xpi -> firefox-94.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/tr.xpi -> firefox-94.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/trs.xpi -> firefox-94.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/uk.xpi -> firefox-94.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/ur.xpi -> firefox-94.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/uz.xpi -> firefox-94.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/vi.xpi -> firefox-94.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/xh.xpi -> firefox-94.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-94.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/94.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-94.0.2-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=a1384f7cd0d6b2369776af25835f2cf5
diff --git a/metadata/md5-cache/www-client/vivaldi-4.3.2439.63 b/metadata/md5-cache/www-client/vivaldi-4.3.2439.63-r1
similarity index 79%
rename from metadata/md5-cache/www-client/vivaldi-4.3.2439.63
rename to metadata/md5-cache/www-client/vivaldi-4.3.2439.63-r1
index efd6c1f5bd06..2ed7a54610ff 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.3.2439.63
+++ b/metadata/md5-cache/www-client/vivaldi-4.3.2439.63-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
-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[gbm] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
+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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.63-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.63-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.63-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a601daa37945fdf41fde9fbd76081bf6
+_md5_=e3bbf2e2d56551dbe38f693d15d80ef7
diff --git a/metadata/md5-cache/www-client/vivaldi-4.3.2439.65 b/metadata/md5-cache/www-client/vivaldi-4.3.2439.65-r1
similarity index 79%
rename from metadata/md5-cache/www-client/vivaldi-4.3.2439.65
rename to metadata/md5-cache/www-client/vivaldi-4.3.2439.65-r1
index 1ffb49cb846a..6a8dbf1bd402 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.3.2439.65
+++ b/metadata/md5-cache/www-client/vivaldi-4.3.2439.65-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-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[gbm] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
+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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.65-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.65-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.65-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5b5d3152d6110762ab8c046fb6722ca0
+_md5_=6613c5b3f052320bf501d972afbe75a2
diff --git a/metadata/md5-cache/www-client/vivaldi-4.3.2439.71 b/metadata/md5-cache/www-client/vivaldi-4.3.2439.71-r1
similarity index 79%
rename from metadata/md5-cache/www-client/vivaldi-4.3.2439.71
rename to metadata/md5-cache/www-client/vivaldi-4.3.2439.71-r1
index ac6e364e041b..4995ba7b85e1 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.3.2439.71
+++ b/metadata/md5-cache/www-client/vivaldi-4.3.2439.71-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-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[gbm] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
+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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.71-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.71-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.71-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5b5d3152d6110762ab8c046fb6722ca0
+_md5_=6613c5b3f052320bf501d972afbe75a2
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2473.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2473.3-r1
similarity index 80%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2473.3
rename to metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2473.3-r1
index 414e3d53b27b..bcabcd75a8d2 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2473.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2473.3-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-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[gbm] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
+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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2473.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2473.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2473.3-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=f43280936d353b6d343a6deea171aac0
+_md5_=5ea25b5e3a181d9a0888401e446ec853
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2482.13 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2482.13-r1
similarity index 80%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2482.13
rename to metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2482.13-r1
index 60c2ea4ddd47..5dac05a7cf8d 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2482.13
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2482.13-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-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[gbm] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
+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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2482.13-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2482.13-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2482.13-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=f43280936d353b6d343a6deea171aac0
+_md5_=5ea25b5e3a181d9a0888401e446ec853
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2488.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2488.3-r1
similarity index 80%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2488.3
rename to metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2488.3-r1
index ec9baa08238b..9c2fb772c86f 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2488.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2488.3-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-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[gbm] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
+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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:96 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2488.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2488.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2488.3-1_arm64.deb )
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=f43280936d353b6d343a6deea171aac0
+_md5_=5ea25b5e3a181d9a0888401e446ec853
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 19f581c9d2d7..c5955a12b5cf 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/xwarppointer-1-r2 b/metadata/md5-cache/x11-apps/xwarppointer-1-r2
deleted file mode 100644
index 6890b6f54c80..000000000000
--- a/metadata/md5-cache/x11-apps/xwarppointer-1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11
-DESCRIPTION=Program to move the mouse cursor
-EAPI=5
-HOMEPAGE=http://www.ishiboo.com/~nirva/Projects/xwarppointer/
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.ishiboo.com/~nirva/Projects/xwarppointer/xwarppointer.tar.gz -> xwarppointer-1.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ca0dba33e7fa02010b1ce2aa1be4db87
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index c0221426af9e..b0e79de37620 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/libva-intel-media-driver-20.1.1-r2 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.1.1-r2
deleted file mode 100644
index 1b89d9e1fc37..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-20.1.1 >=x11-libs/libva-2.7.1[X?] >=x11-libs/libpciaccess-0.13.1-r1:=
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=X set-as-default
-KEYWORDS=~amd64
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-20.1.1 >=x11-libs/libva-2.7.1[X?] >=x11-libs/libpciaccess-0.13.1-r1:=
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-20.1.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=93e3b5c0150e26c6752d371b7219230a
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.2.0-r2 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.2.0-r2
deleted file mode 100644
index 845469497395..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-20.2.2 >=x11-libs/libva-2.8.0[X?] >=x11-libs/libpciaccess-0.13.1-r1:=
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=X set-as-default
-KEYWORDS=~amd64
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-20.2.2 >=x11-libs/libva-2.8.0[X?] >=x11-libs/libpciaccess-0.13.1-r1:=
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-20.2.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5f076398dd9df823bae0bd8ebd7d0fbe
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.2_pre b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.2_pre
deleted file mode 100644
index 257dda9fbeea..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.2_pre
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-20.4.1 >=x11-libs/libva-2.10.0[X?]
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=+custom-cflags set-as-default test X
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-20.4.1 >=x11-libs/libva-2.10.0[X?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.1.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1c1c2046c773d338912e2f8d437a668e
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.3 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.3
deleted file mode 100644
index 851dcd89fa23..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-21.1.1 >=x11-libs/libva-2.11.0[X?]
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=+custom-cflags set-as-default test X
-KEYWORDS=~amd64
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-21.1.1 >=x11-libs/libva-2.11.0[X?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.1.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=4280973574be76cdbf821aba4184808a
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.2.2_pre b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.2.2_pre
deleted file mode 100644
index 1e9b759b3ebc..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.2.2_pre
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=+custom-cflags set-as-default test X
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.2.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=afa8224c1f1553e7edb6f9c7918ff9e4
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.2.3 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.2.3
deleted file mode 100644
index 98277d2963f9..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-21.2.1 >=x11-libs/libva-2.12.0[X?]
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=+custom-cflags set-as-default test X
-KEYWORDS=~amd64
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-21.2.1 >=x11-libs/libva-2.12.0[X?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.2.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=bc929b2e38de8abdd77364418549fc1a
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.2_pre b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.2_pre
deleted file mode 100644
index a5a684761f70..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.2_pre
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=+custom-cflags set-as-default test X
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.3.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=afa8224c1f1553e7edb6f9c7918ff9e4
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.3_pre b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.3_pre
deleted file mode 100644
index e6f3921f4752..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.3_pre
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
-DESCRIPTION=Intel Media Driver for VAAPI (iHD)
-EAPI=7
-HOMEPAGE=https://github.com/intel/media-driver
-IUSE=+custom-cflags set-as-default test X
-LICENSE=MIT BSD
-RDEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.3.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=afa8224c1f1553e7edb6f9c7918ff9e4
diff --git a/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1 b/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
deleted file mode 100644
index 251658cfd0df..000000000000
--- a/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 media-libs/freeglut virtual/opengl x11-libs/libXmu virtual/pkgconfig
-DESCRIPTION=3D File Browser
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/dz3d/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 media-libs/freeglut virtual/opengl x11-libs/libXmu
-SLOT=0
-SRC_URI=mirror://sourceforge/dz3d/3dfb-0.6.1.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56
-_md5_=5fab99c3318383027609ce635c7e78c3
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f6a62ee92db9..2e5ca22d63d0 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-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index a54f94f95d48..340fe5f5439c 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/redhat-artwork-5.0.8-r4 b/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
deleted file mode 100644
index a553977073db..000000000000
--- a/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=x11-libs/gtk+:2 dev-util/intltool media-gfx/icon-slicer virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/rpm2targz
-DESCRIPTION=RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and Nautilus
-EAPI=5
-HOMEPAGE=https://www.redhat.com
-IUSE=audacious cursors gdm icons nautilus
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/redhat-artwork-5.0.8-4.fc7.src.rpm
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ca2e2e1530d59d00d86f086b5650215
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5317448d6e41..55cc58e257e4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Nov 2021 17:09:04 +0000
+Sat, 20 Nov 2021 03:39:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 848ae3848a60..18a51b4752ce 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Nov 19 05:09:04 PM UTC 2021
+Sat Nov 20 03:39:05 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 27aa4f87949e..9170180147ab 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Nov 2021 17:30:01 +0000
+Sat, 20 Nov 2021 04:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index addf88e211fd..ae269c4d2ef7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7aa97071c5a9c0a4ffe80a692a1baa0c234c46ee 1637340781 2021-11-19T16:53:01+00:00
+08a08367347abeb735229c8e72fb012b50cc9de2 1637375866 2021-11-20T02:37:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2ff5fbafc343..70b43e439116 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1637341501 Fri 19 Nov 2021 05:05:01 PM UTC
+1637379301 Sat 20 Nov 2021 03:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5317448d6e41..55cc58e257e4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Nov 2021 17:09:04 +0000
+Sat, 20 Nov 2021 03:39:05 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f331e901a98c..f557abd319e0 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest
deleted file mode 100644
index 10c96375f852..000000000000
--- a/net-analyzer/quidscor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quidscor-1.2.48-src.tar.gz 77843 BLAKE2B 4f9feffb67acc8f32c4f922ce882a0799549ecce8e439dffeee5d0e4ec967739646a0ee4912a189e99c9f39743a74ae1f5528050daa82689f35ba498b2bad87f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
deleted file mode 100644
index 5f1e035c81d6..000000000000
--- a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libqg/libqg.h
-+++ b/libqg/libqg.h
-@@ -38,7 +38,6 @@
- #include <arpa/inet.h>
- #include <dirent.h>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <string.h>
- #include <strings.h>
- #include <libxml/xmlmemory.h>
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch
deleted file mode 100644
index 6168720cbdf4..000000000000
--- a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/quidscor.conf
-+++ b/quidscor.conf
-@@ -15,9 +15,9 @@
- # Logdir: directory
- LOGDIR /var/log/quidscor/
- # Cachedir: directory
--CACHEDIR /var/run/quidscor/cache/
-+CACHEDIR /var/lib/quidscor
- # Rulesdir: directory where .rules (for snort) live (.lib for dragon)
--RULESDIR /usr/local/etc/snort-rules
-+RULESDIR /etc/snort/rules
- # Expiretime: time_in_seconds
- EXPIRETIME 86400
- # File for custom mapping (must be absolute path)
---- a/quidscor.h
-+++ b/quidscor.h
-@@ -85,7 +85,7 @@
- #define AL_UNVER                "alerts_unknown.log" 
- 
- // Directories
--#define CACHE_DIR               "run/quidscor/cache/"
-+#define CACHE_DIR               "/lib/quidscor"
- #define LOG_DIR                 "log/quidscor/"
- #define CREATE_MOD              0700
- #define MOD_PID                 0640
---- a/Makefile
-+++ b/Makefile
-@@ -84,8 +84,7 @@
- 
- install:
- 	install -d -m 0700 $(IVARPREFIX)/log/$(PNAME)/
--	install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/
--	install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/cache/
-+	install -d -m 0700 $(IVARPREFIX)/lib/$(PNAME)/
- 	install -d -m 0755 $(IPREFIX)/sbin/
- 	install -m 0755 $(PNAME) $(IPREFIX)/sbin/$(PNAME)
- 	install -d -m 0755 $(IPREFIX)/etc/
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
deleted file mode 100644
index 9d169e619c0b..000000000000
--- a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -69,7 +69,6 @@
- 
- $(PNAME): $(PNAME).debug	 
- 	$(CP) $(PNAME).debug $@
--	$(STRIP) $@	 
- 
- $(PNAME).debug: libqg/libqg.a $(OFILES) Makefile
- 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS)
diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml
deleted file mode 100644
index 3d6e480239d4..000000000000
--- a/net-analyzer/quidscor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">quidscor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
deleted file mode 100644
index 15a6af1294c1..000000000000
--- a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs
-
-DESCRIPTION="Qualys IDS Correlation Daemon"
-HOMEPAGE="http://quidscor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-DEPEND="
-	>=dev-libs/libxml2-2.4
-	>=net-misc/curl-7.10
-	>=net-analyzer/snort-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-curl-types.h.patch \
-		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}"/${P}-strip.patch
-
-	#yes, the fix below is as pathetic as it seems
-	echo "#define FALSE 0" >> libqg/libqg.h || die
-	echo "#define TRUE 1" >> libqg/libqg.h || die
-}
-
-src_compile() {
-	emake EXTRA_CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX=/usr STAGING_PREFIX="${D}" install
-	dodoc ChangeLog FAQ MANIFEST README TODO
-
-	# fix ugly install
-	cd "${D}"/usr || die
-	mv etc .. || die
-	rm -r doc || die
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 45836920430d..f5f897278ee2 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/cistronradius/Manifest b/net-dialup/cistronradius/Manifest
deleted file mode 100644
index a767c6728a83..000000000000
--- a/net-dialup/cistronradius/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST radiusd-cistron-1.6.8.tar.gz 199459 BLAKE2B 5cd40915597e8d02c4624c0ea9161ee50a09c85137f9cf2d84f99504af1581a58c52d99aab473a034ef557beefd1fc7753757b4a04c1bd460871d37a6c7479da SHA512 9d42ec39eaa78f0c35ca036cf891d45a99c38af03416e4bca2d9d883a9aac818a0da1a52b5c1d4e54a1bdb108b237ed92c16309b61b7aa24f8782d0d0e0f8de5
diff --git a/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild b/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild
deleted file mode 100644
index 4ff41bdc7fcd..000000000000
--- a/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs
-
-DESCRIPTION="Authentication and accounting server for terminal servers using RADIUS"
-HOMEPAGE="http://www.radius.cistron.nl/"
-SRC_URI="ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-
-DEPEND="
-	!net-dialup/freeradius
-	!net-dialup/gnuradius"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/radiusd-cistron-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-	sed -i -e "s:SHAREDIR/::g" raddb/dictionary || die
-	mv src/checkrad.pl src/checkrad || die
-
-	epatch_user
-}
-
-src_compile() {
-	emake -C src \
-	    CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-	    BINDIR=/usr/bin SBINDIR=/usr/sbin \
-	    MANDIR=/usr/share/man SHAREDIR=/usr/share/radius
-}
-
-src_install() {
-	insinto /etc/raddb
-	doins raddb/*
-	dodoc README doc/{ChangeLog,FAQ.txt,README*}
-	doman doc/{*.1,*.8,*.5rad,*.8rad}
-
-	dosbin src/{checkrad,radiusd,radrelay}
-	dobin src/{radclient,radlast,radtest,radwho,radzap}
-
-	newinitd "${FILESDIR}/cistronradius.rc" cistronradius
-}
diff --git a/net-dialup/cistronradius/files/cistronradius-1.6.8-gcc41.patch b/net-dialup/cistronradius/files/cistronradius-1.6.8-gcc41.patch
deleted file mode 100644
index 7600df739c7b..000000000000
--- a/net-dialup/cistronradius/files/cistronradius-1.6.8-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru radiusd-cistron-1.6.8.orig/src/radiusd.h radiusd-cistron-1.6.8/src/radiusd.h
---- radiusd-cistron-1.6.8.orig/src/radiusd.h	2003-12-08 18:12:22.000000000 +0200
-+++ radiusd-cistron-1.6.8/src/radiusd.h	2006-09-21 15:33:05.000000000 +0300
-@@ -204,7 +204,6 @@
- extern char		*radwtmp_path;
- extern UINT4		expiration_seconds;
- extern UINT4		warning_seconds;
--extern int		radius_pid;
- extern int		use_dbm;
- extern int		use_dns;
- extern int		use_wtmp;
diff --git a/net-dialup/cistronradius/files/cistronradius.rc b/net-dialup/cistronradius/files/cistronradius.rc
deleted file mode 100644
index 9155ee59b6a5..000000000000
--- a/net-dialup/cistronradius/files/cistronradius.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -x /usr/sbin/radiusd ] ; then
-		eerror "The radius daemon was not found."
-		eerror "Please (re)emerge cistronradius."
-		return 1
-	fi
-
-	if [ ! -e /etc/raddb/clients ] ; then
-		eerror "No /etc/raddb/clients file found."
-		eerror "Please create the file and retry."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting Cistron Radius"
-	start-stop-daemon --start --quiet --exec /usr/sbin/radiusd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Cistron Radius"
-	start-stop-daemon --stop --quiet --pidfile /var/run/radiusd.pid
-	eend $?
-}
diff --git a/net-dialup/cistronradius/metadata.xml b/net-dialup/cistronradius/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-dialup/cistronradius/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-dialup/fbgetty/Manifest b/net-dialup/fbgetty/Manifest
deleted file mode 100644
index aa5f7494e294..000000000000
--- a/net-dialup/fbgetty/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fbgetty-0.1.698.tar.gz 279751 BLAKE2B 5e378f563b1d8bf70145aadbecd46a9ad2228c3e5fc95cb91dc12a6682bce40ddc4a3aa0d81e27c0abe7122c5ac3a62e94946122aeceb3ab66ad891df26cc4db SHA512 942304ac00ecfaad59419a0994331e59d91269ee015e3bd38faa85db0b205e6e88e1958b65e503f59b81f050a1e110aeea6534eecb3ba010096a6b5173fd1ac5
diff --git a/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild b/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild
deleted file mode 100644
index aaaf230f6da4..000000000000
--- a/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-DESCRIPTION="An extended getty for the framebuffer console"
-HOMEPAGE="http://projects.meuh.org/fbgetty/"
-SRC_URI="http://projects.meuh.org/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-
-	epatch_user
-}
-
-src_install() {
-	default
-
-	docompress -x "/usr/share/doc/${PF}/examples"
-	insinto "/usr/share/doc/${PF}/examples"
-	doins examples/{issue.*,inittab.*}
-}
diff --git a/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch b/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch
deleted file mode 100644
index a9722f12c115..000000000000
--- a/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nru fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk
---- fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk	2001-07-11 23:01:15.000000000 +0300
-+++ fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk	2007-10-27 11:29:50.000000000 +0300
-@@ -45,8 +45,7 @@
-   name = $3;
-   type = $2;
- 
--  printf("#define OFFSET_%s (offsetof(struct fbgetty_options_t, %s))\n", name, name);
--  printf(" %s %s;\n\n", type, name);     
-+  printf(" %s %s;\n", type, name);     
- }
- 
- END {
-diff -Nru fbgetty-0.1.698.orig/src/options.c fbgetty-0.1.698/src/options.c
---- fbgetty-0.1.698.orig/src/options.c	2001-12-17 22:55:42.000000000 +0200
-+++ fbgetty-0.1.698/src/options.c	2007-10-27 11:32:53.000000000 +0300
-@@ -27,7 +27,7 @@
-  */
- 
- #include <fbgetty/global.h>
--
-+#include <stddef.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -141,7 +141,7 @@
- #define ENV_BINARY  0x04
- #define ENV_LEDS    0x08
- 
--#define ENV_ENTRY(name, type, ptr) { name, type, OFFSET_ ## ptr }
-+#define ENV_ENTRY(name, type, ptr) { name, type, offsetof(struct fbgetty_options_t, ptr) }
- 
- static struct env_entry
- {
-@@ -899,20 +899,20 @@
- } 
- merge_option_list[] = 
- {
--  { OFFSET_tty_device ,    MERGE_STR, NULL, -1 },
-+  { offsetof(struct fbgetty_options_t, tty_device) ,    MERGE_STR, NULL, -1 },
- #ifdef USE_FRAME_BUFFER
--  { OFFSET_fb_device,      MERGE_STR, NULL, -1 },
-+  { offsetof(struct fbgetty_options_t, fb_device),      MERGE_STR, NULL, -1 },
- #endif
- 
--  { OFFSET_login_program,  MERGE_STR, LOGIN_PROGRAM, -1 },
--  { OFFSET_login_prompt,   MERGE_STR, LOGIN_PROMPT, -1 },
--  { OFFSET_issue_filename, MERGE_STR, ISSUE_FILE, -1 },
-+  { offsetof(struct fbgetty_options_t, login_program),  MERGE_STR, LOGIN_PROGRAM, -1 },
-+  { offsetof(struct fbgetty_options_t, login_prompt),   MERGE_STR, LOGIN_PROMPT, -1 },
-+  { offsetof(struct fbgetty_options_t, issue_filename), MERGE_STR, ISSUE_FILE, -1 },
- 
--  { OFFSET_login_timeout,  MERGE_INT, NULL, LOGIN_TIMEOUT },
--  { OFFSET_issue_refresh,  MERGE_INT, NULL, ISSUE_REFRESH },
--  { OFFSET_screen_clear,   MERGE_INT, NULL, TRUE },
-+  { offsetof(struct fbgetty_options_t, login_timeout),  MERGE_INT, NULL, LOGIN_TIMEOUT },
-+  { offsetof(struct fbgetty_options_t, issue_refresh),  MERGE_INT, NULL, ISSUE_REFRESH },
-+  { offsetof(struct fbgetty_options_t, screen_clear),   MERGE_INT, NULL, TRUE },
- 
--  { OFFSET_leds,           MERGE_INT, NULL, 0 },
-+  { offsetof(struct fbgetty_options_t, leds),           MERGE_INT, NULL, 0 },
-   { 0, 0, NULL, -1 }
- };
- 
diff --git a/net-dialup/fbgetty/metadata.xml b/net-dialup/fbgetty/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-dialup/fbgetty/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 1cd70c53521d..9815eaae72c9 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 8f09bc4eb7b6..9ba8523f3bc9 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,3 +1,4 @@
 DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 5063090d648668f4d5ae6d4be48ebecc65dfd4b525768e94a0d90ceebbee73874c916727be8de633550db71c612d698d88cf93575931362b48d954e6ac275143 SHA512 1c5709825c8b2c13cbed0310658959ecee164c930bc9e2447618a0894598138b9a549d20509c32a5c23ce99e40438df38f9e170cf656ce993d819f365490a180
 DIST nftables-0.9.9.tar.bz2 922624 BLAKE2B 8de2709576a26ca84a8d694f7cb06cad2bb2fb4671ba21ffc32c0d5997e8124ae7cd794dafddf4db48d8a49c280b48b07d2a31b6c18f6647fdb67cfe7f065b61 SHA512 dfdd3ffc0ffc1742ca0494a3f8fac1c7b2fe942849e60d33fc3cb8a51e27bd39e1ccfeda2195191377a32bb5363ea244f4c3e71b4a6d930f33bf87e17a534fab
 DIST nftables-1.0.0.tar.bz2 921053 BLAKE2B ee86a323170433c3ba62f80118947864aac0fe0aaeb48afeb5a116a48782185c83313ef1b5735c7749eb5eccb88f252b444d1ee908be25bdaa4d9c0b833c1dc2 SHA512 33460bef4ee76b7caa44fa5515357127ae84be468448cc838dd31919b6e045ba6195b761118d4c8a4219a9f008c4416542ce784f4daad94f3b44c0626bcdd014
+DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B e406699c96b98495f1b6deeab0233873ce20b43c13c162eafea1e6b371961123a69f3d5e7bd2f1bedfdbe58fed56ba3e2dae962b88657af6f4ab5b3743fb6373 SHA512 a0db4d82725509d2a9c638ba7ba55547ad7b5138a5fe686b0e90260d6a65e060dd72a470969c1d69e945303bd2bfc33b2021d9f4141b88befefddc61b7afe10d
diff --git a/net-firewall/nftables/nftables-1.0.1.ebuild b/net-firewall/nftables/nftables-1.0.1.ebuild
new file mode 100644
index 000000000000..944c87fea31f
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools linux-info python-r1 systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+
+	BDEPEND="
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:0=
+	>=net-libs/libnftnl-1.2.1:0=
+	gmp? ( dev-libs/gmp:0= )
+	json? ( dev-libs/jansson:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	xtables? ( >=net-firewall/iptables-1.6.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND+="
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	libedit? ( !readline )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.8-slibtool.patch"
+)
+
+python_make() {
+	emake \
+		-C py \
+		abs_builddir="${S}" \
+		DESTDIR="${D}" \
+		PYTHON_BIN="${PYTHON}" \
+		"${@}"
+}
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern-kernel && kernel_is lt 3 18; then
+			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix installation path for doc stuff
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
+		-i files/nftables/Makefile.am || die
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
+		-i files/osf/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with libedit cli editline)
+		$(use_with readline cli readline)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_foreach_impl python_make
+	fi
+}
+
+src_install() {
+	default
+
+	if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
+		pushd doc >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
+	local mksuffix="$(usex modern-kernel '-mk' '')"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	if use python ; then
+		python_foreach_impl python_make install
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f "${save_file}" ]]; then
+		( umask 177; touch "${save_file}" )
+	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
+		ewarn "Your system has dangerous permissions for ${save_file}"
+		ewarn "It is probably affected by bug #691326."
+		ewarn "You may need to fix the permissions of the file. To do so,"
+		ewarn "you can run the command in the line below as root."
+		ewarn "    'chmod 600 \"${save_file}\"'"
+	fi
+
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
+}
diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild
index 376318f5382c..944c87fea31f 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 	"
 else
 	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -29,7 +29,7 @@ IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs xt
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:0=
-	>=net-libs/libnftnl-1.2.0:0=
+	>=net-libs/libnftnl-1.2.1:0=
 	gmp? ( dev-libs/gmp:0= )
 	json? ( dev-libs/jansson:= )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 2fcaf5d8f0df..834be4447493 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/openafs-legacy/Manifest b/net-fs/openafs-legacy/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/net-fs/openafs-legacy/metadata.xml b/net-fs/openafs-legacy/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-fs/openafs-legacy/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild b/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
deleted file mode 100644
index 5ad939b711b2..000000000000
--- a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Legacy path symlinks to access FHS-compliant OpenAFS installation"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/baselayout"
-RDEPEND="${DEPEND}"
-PDEPEND="net-fs/openafs"
-
-S="${WORKDIR}"
-
-# As a guide for these links, acinclude.m4 from the openafs package was
-# used.  A README file exists as well, but at the time of writing, the
-# afsbosserver-variable was inaccurately described.
-
-src_install() {
-	# some basenames for FHS paths
-	sysconfdir=/etc
-	libexecdir=/usr/libexec
-	localstatedir=/var/lib
-	sbindir=/usr/sbin
-
-	# create parent directories for Transarc mode
-	dodir /usr/{vice,afs}
-
-	# viceetcdir
-	viceetcdir=${sysconfdir}/openafs
-	dosym ${viceetcdir} /usr/vice/etc
-
-	# afssrvdir
-	afssrvbindir=${libexecdir}/openafs
-	dosym ${afssrvbindir} /usr/afs/bin
-
-	# afsconfdir
-	afsconfdir=${sysconfdir}/openafs/server
-	dosym ${afsconfdir} /usr/afs/etc
-
-	# afslocaldir
-	afslocaldir=${localstatedir}/openafs
-	dosym ${afslocaldir} /usr/afs/local
-
-	# afsdbdir
-	afsdbdir=${localstatedir}/openafs/db
-	dosym ${afsdbdir} /usr/afs/db
-
-	# afslogdir
-	afslogdir=${localstatedir}/openafs/logs
-	dosym ${afslogdir} /usr/afs/logs
-
-	# afsbosconfig
-	dodir ${afslocaldir}
-	dosym ${viceetcdir}/BosConfig ${afslocaldir}/BosConfig
-
-	# afsbosserver
-	dodir ${afssrvbindir}
-	dosym ${sbindir}/bosserver ${afssrvbindir}/bosserver
-}
-
-pkg_prerm() {
-	ewarn "It is recommended to remove this package AFTER removing openafs"
-	ewarn "This way there will be no dead links left lying around"
-}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e62e97858cb7..0c1395126b91 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/profxp/Manifest b/net-ftp/profxp/Manifest
deleted file mode 100644
index 3aaa4d95ac8e..000000000000
--- a/net-ftp/profxp/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST SOCKS.pm 17069 BLAKE2B 01830c151b33d2cb042f19f346d8a32fd8932743f99c0e6f42c195c5482fb22a85e4ec071c8a6bf4c75cddcf8c0fcb9fd7ed4afc97c88c4761c0e0a76c14a133 SHA512 87029d9fb58ba384499a2ac73d661dd4c91faa81636e41c1d3c3a1d1efab1d5e01804467428d1daf8dd2fcb231666e2986f6cc806f5f7d419e7d3280a95c497e
-DIST profxp-v3-pre2-src.tar.gz 16647 BLAKE2B 2208be3d5d9dc34b27d2d653f1d959902327df34f8d2a72b920a0107b95a57a25b8ada821c1a0e3ddd957feba4046e113ed29ed574b17256b602728a1cf88477 SHA512 5f48e15f0c6c43c8b20b7cb72bf642e12a99d469bea21372a7a602d5f8522c4097d18918a3a007961b3ea6177ec864d50a7bc24211194ac9d791c5190978e167
diff --git a/net-ftp/profxp/metadata.xml b/net-ftp/profxp/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-ftp/profxp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-ftp/profxp/profxp-3_pre2-r2.ebuild b/net-ftp/profxp/profxp-3_pre2-r2.ebuild
deleted file mode 100644
index c78525fd1b9f..000000000000
--- a/net-ftp/profxp/profxp-3_pre2-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="FXP (server-to-server FTP) commandline client written in Perl"
-HOMEPAGE="https://duncanthrax.net/profxp/"
-SRC_URI="https://duncanthrax.net/profxp/profxp-v${PV/_/-}-src.tar.gz
-	http://search.cpan.org/src/CLINTDW/SOCKS-0.03/lib/Net/SOCKS.pm"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/perl-Time-HiRes
-	dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Perl"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack profxp-v${PV/_/-}-src.tar.gz
-	cp "${DISTDIR}"/SOCKS.pm "${S}"/
-}
-
-src_prepare() {
-	sed -i 's:/home/tom/ActivePerl-5\.6:/usr:' "${S}"/profxpv3.pl || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	perl_set_version
-	newbin profxpv3.pl profxp.pl
-	dosym profxp.pl /usr/bin/profxp
-	insinto ${ARCH_LIB}/Net
-	doins SOCKS.pm
-	insinto ${ARCH_LIB}/${PN}
-	doins ${PN}/*.pm
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index d3f20f98c0a1..32c9ce6eba19 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index a8ec193e233b..492e21041f0b 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1 +1,2 @@
 DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380
+DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
diff --git a/net-libs/libnftnl/libnftnl-1.2.1.ebuild b/net-libs/libnftnl/libnftnl-1.2.1.ebuild
new file mode 100644
index 000000000000..75e1ab39a6c8
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.4:="
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 520ebcc9b91b..0e19feb57edf 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild b/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild
index f1044210529a..f367d114833e 100644
--- a/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild
+++ b/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild
@@ -22,8 +22,8 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/openssl:0
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)
 "
 
diff --git a/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild b/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild
index c1df02810a65..6c7c06277ceb 100644
--- a/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild
+++ b/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)
 	dev-libs/glib:2
 	dev-libs/openssl:0
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 79b970f099d3..8d40cccd7db2 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/resilio-sync/resilio-sync-2.6.3-r2.ebuild b/net-p2p/resilio-sync/resilio-sync-2.6.3-r2.ebuild
index cf39bd118bf6..166fe8dcb1d0 100644
--- a/net-p2p/resilio-sync/resilio-sync-2.6.3-r2.ebuild
+++ b/net-p2p/resilio-sync/resilio-sync-2.6.3-r2.ebuild
@@ -29,8 +29,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)"
 
 DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 993a408cbf3b..6dc8ce6f4272 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/mdk/mdk-3.6-r1.ebuild b/net-wireless/mdk/mdk-3.6-r1.ebuild
index 26bffddfa6e9..e90cd46c37f6 100644
--- a/net-wireless/mdk/mdk-3.6-r1.ebuild
+++ b/net-wireless/mdk/mdk-3.6-r1.ebuild
@@ -23,7 +23,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f2d19125ae0c..ac0ea4f1050b 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 12b7cd8ad2fd..18c104455d62 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-11-19)
+# Doesn't work with latest versions of adb, source not easily ported
+# to python 3.9 and 3.10. No upstream activity for 7 years.
+# Removal on 2021-12-19.  Bug #825038.
+app-mobilephone/adb-sync
+
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-18)
 # Library without consumers, Removal in 30 days.
 dev-java/piccolo2d
@@ -484,72 +490,6 @@ media-gfx/iscan-plugin-perfection-v370
 # Masked for removal on 2021-11-22
 net-misc/bwwhois
 
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# Dead upstream, EAPI 5, broken build system, no revdeps.
-# Removal on 2021-11-20. Bug #819366
-net-analyzer/quidscor
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, no revdeps, dead upstream, EAPI 5.
-# No other distro is packaging this.
-# Removal on 2021-11-20. Bug #819363
-net-dialup/cistronradius
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, no revdeps, dead upstream, EAPI 5.
-# No other distro is packaging this.
-# Removal on 2021-11-20. Bug #819354
-net-dialup/fbgetty
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# Legacy package, no revdeps, EAPI 5.
-# Removal on 2021-11-20. Bug #819345
-net-fs/openafs-legacy
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, dead upstream, EAPI 5.
-# No other distro is packaging this. Bug #819339
-# Removal on 2021-11-20.
-net-ftp/profxp
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, dead upstream, EAPI 5.
-# No other distro is packaging this. Bug #819231
-# Removal on 2021-11-20.
-sys-auth/ykneo-ccid-tools
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, dead upstream, EAPI 5.
-# No other distro is packaging this. Bug #819171
-# Removal on 2021-11-20.
-x11-apps/xwarppointer
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, EAPI 5, no other distro is packaging this.
-# Removal on 2021-11-20. Bug #819165
-x11-misc/3dfb
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# Unmaintained, stuck on EAPI 5, full of hacks and patches.
-# No other distro is packaging this. Bug #819141
-# Removal on 2021-11-20.
-x11-themes/redhat-artwork
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, EAPI 5, no other distro is packaging this.
-# Removal on 2021-11-20. Bug #819126
-sci-geosciences/swmm
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# No maintainer, EAPI 5, no other distro is packaging this.
-# Removal on 2021-11-20. Bug #819123
-sci-geosciences/harmonics-dwf-free-noncomm
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-10-21)
-# Stuck on EAPI 5, no other distro is packaging this. Bug #575684
-# Removal on 2021-11-20.
-sci-electronics/quartus-prime-lite
-
 # Sam James <sam@gentoo.org> (2021-10-10)
 # Needs upstream build system fixes (currently in progress).
 # Python toggles don't work correctly right now.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a04a58ef10df..c1c115e926a1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8921,11 +8921,6 @@ x11-themes/gtk-engines-murrine:themes - Pull in themes via x11-themes/murrine-th
 x11-themes/gtk-engines-nodoka:animation-rtl - Progressbar animation from right to left
 x11-themes/kfaenza:additional - Install additional KFaenza icons. See third homepage for details
 x11-themes/mate-themes-meta:gtk2-only - Allow dependency-resolution for a system without GTK+3
-x11-themes/redhat-artwork:audacious - Install media-sound/audacious theme
-x11-themes/redhat-artwork:cursors - Install Bluecurve cursors
-x11-themes/redhat-artwork:gdm - Install Bluecurve gnome-base/gdm theme
-x11-themes/redhat-artwork:icons - Install Bluecurve icons
-x11-themes/redhat-artwork:nautilus - Install Bluecurve gnome-base/nautilus icons
 x11-themes/vertex-theme:cinnamon - Install theme for gnome-extra/cinnamon
 x11-themes/vertex-theme:gnome-shell - Install theme for gnome-base/gnome-shell
 x11-themes/vertex-theme:mate - Install Metacity theme for mate-base/mate
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 756a0edb6043..e555ba9b67ed 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/quartus-prime-lite/Manifest b/sci-electronics/quartus-prime-lite/Manifest
deleted file mode 100644
index 82c6b0e92df9..000000000000
--- a/sci-electronics/quartus-prime-lite/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Quartus-lite-15.1.0.185-linux.tar 5969776640 BLAKE2B 622060e053a9d7a91fe9b4b61f6ebf1289f3849e666b20bca801f0bd752dac0f551c7aa2b8d16b6238b6df2b174f8d352bbc2e3a2a9e270735c5581dd81420f5 SHA512 7996bc9e0561b650c0318d608b4f59560dd631e3a38c403105f797049c395ce25a0ff5d4346cf6e91338fa297d7e8752ef5a3f83f496d4431ad3591de4335045
-DIST libfreetype.so.6 785880 BLAKE2B a9c724a213d6211e954c20ea203feeacd384768bf34929719326d2a98e166c91114f4a60b223efd770ccf356662c8664c91d4bf4722325c01d310a10e3026f30 SHA512 4b0ae581df3ecc0117d8b12405d7e5203d1ec40e965c39dade16c4b5495e95c71c2c5d739ccfec7c4c90dd2f48c004f4ae49497c46927adc81c98ead52978be1
diff --git a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-qenv-lib32.patch b/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-qenv-lib32.patch
deleted file mode 100644
index 8e3f117e7959..000000000000
--- a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-qenv-lib32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /opt/quartus-lite-15.1.0.185/quartus/adm/qenv.sh.org	2016-03-01 18:51:38.192388962 +0800
-+++ /opt/quartus-lite-15.1.0.185/quartus/adm/qenv.sh	2016-02-25 09:22:28.580259994 +0800
-@@ -136,7 +136,7 @@
- ##### Quartus path setup
- 
- export PATH=$QUARTUS_BINDIR:$PATH
--export LD_LIBRARY_PATH=$QUARTUS_BINDIR:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH=$QUARTUS_BINDIR:$LD_LIBRARY_PATH:/opt/quartus-lite-15.1.0.185/modelsim_ase/lib32
- 
- 
- # Add <qdir>/adm to path, it has some helper tools
diff --git a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-vso-launcher.patch b/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-vso-launcher.patch
deleted file mode 100644
index e152aed093cc..000000000000
--- a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-vso-launcher.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- /opt/quartus-lite-15.1.0.185/modelsim_ase/vco.org	2016-03-02 19:05:09.566449182 +0800
-+++ /opt/quartus-lite-15.1.0.185/modelsim_ase/vco	2016-03-02 19:06:19.020221005 +0800
-@@ -48,6 +48,7 @@
- done
- 
- dir=`dirname "$arg0"`
-+export LD_LIBRARY_PATH=${dir}/lib32
- 
- vco=${uname}${utype}
- case $vco in
-@@ -203,7 +204,7 @@
-           2.[5-9]*)         vco="linux" ;;
-           2.[1-9][0-9]*)    vco="linux" ;;
-           3.[0-9]*)    		vco="linux" ;;
--          *)                vco="linux_rh60" ;;
-+          *)                vco="linux" ;;
-         esac
-         if [ ! -x "$dir/$vco/vsim" ]; then
-           if [ -x "$dir/linuxle/vsim" ]; then
diff --git a/sci-electronics/quartus-prime-lite/metadata.xml b/sci-electronics/quartus-prime-lite/metadata.xml
deleted file mode 100644
index b8d0419909b6..000000000000
--- a/sci-electronics/quartus-prime-lite/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">brendanhoran/gentoo-custom</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild
deleted file mode 100644
index 82920e59203c..000000000000
--- a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit desktop
-
-DESCRIPTION="Full-featured EDA product for altera devices"
-HOMEPAGE="https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html"
-SRC_URI="Quartus-lite-${PV}-linux.tar"
-# variable to store the download URL
-DOWNLOADPAGE="http://dl.altera.com/?edition=lite"
-
-LICENSE="Quartus-prime-megacore"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-libs/libpng-compat:1.2"
-
-RESTRICT="fetch bindist"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	elog "Due to licensing restrictions, you need to download the distfile manually."
-	elog "Please navigate to ${DOWNLOADPAGE}"
-	elog "Sign in with your Altera account (you need to register)"
-	elog "Download ${SRC_URI} and place it into your DISTDIR directory"
-	elog "And restart the installation."
-}
-
-pkg_pretend() {
-	einfo "The checksum and unpack will take quite some time to run"
-}
-
-src_install() {
-	einfo "The Quartus install runs in unattended mode"
-	einfo "you wont see much and it will take a long time"
-
-	./setup.sh --mode unattended --unattendedmodeui none \
-		--installdir "${D}/opt/quartus-lite-${PV}"
-	make_desktop_entry "/opt/quartus-lite-${PV}/quartus/bin/quartus" \
-		"Quartus lite ${PV}" "/opt/quartus-lite-${PV}/quartus/adm/quartusii.png"
-}
-
-pkg_postinst() {
-	elog "To launch Quartus, run /opt/quartus-lite-${PV}/quartus/bin/quartus"
-}
diff --git a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild
deleted file mode 100644
index 41d04df27654..000000000000
--- a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop epatch
-
-DESCRIPTION="Full-featured EDA product for altera devices"
-HOMEPAGE="https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html"
-SRC_URI="Quartus-lite-${PV}-linux.tar
-	https://github.com/brendanhoran/gentoo-custom/raw/master/files/libfreetype.so.6"
-# variable to store the download URLS
-DOWNLOADPAGE="http://dl.altera.com/?edition=lite"
-DOWNLOADFT="https://raw.githubusercontent.com/brendanhoran/gentoo-custom/master/files/libfreetype.so.6"
-
-LICENSE="Quartus-prime-megacore"
-SLOT="0"
-
-# No keywords as per bug 575684
-KEYWORDS=""
-
-RDEPEND="media-libs/libpng-compat:1.2[abi_x86_32]
-		x11-libs/libXft[abi_x86_32]
-		app-arch/bzip2[abi_x86_32]
-		sys-libs/zlib[abi_x86_32]
-		sys-libs/glibc[multilib]"
-
-RESTRICT="fetch bindist"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	elog "Due to licensing restrictions, and old libary versions."
-	elog "You need to download the distfiles manually."
-	elog "-------------------------------------------------------"
-	elog "For Quartus :"
-	elog "Please navigate to ${DOWNLOADPAGE}"
-	elog "Sign in with your Altera account (you need to register)"
-	elog "Download Quartus-lite-${PV}-linux.tar  and place it into your DISTDIR directory"
-	elog "-------------------------------------------------------"
-	elog "For Freetype libary :"
-	elog "Please download the following file :"
-	elog "${DOWNLOADFT}"
-	elog "Please place this into your DISTDIR directory"
-	elog "-------------------------------------------------------"
-	elog "And restart the installation."
-}
-
-pkg_pretend() {
-	einfo "The checksum and unpack will take quite some time to run"
-}
-
-src_install() {
-	einfo "The Quartus install runs in unattended mode"
-	einfo "you wont see much and it will take a long time"
-
-	./setup.sh --mode unattended --unattendedmodeui none \
-		--installdir "${D}/opt/quartus-lite-${PV}" || die
-	make_desktop_entry "/opt/quartus-lite-${PV}/quartus/bin/quartus" \
-		"Quartus lite ${PV}" "/opt/quartus-lite-${PV}/quartus/adm/quartusii.png"
-	pushd "${D}"
-	# Patch qenv to find extra 32bit libs
-	epatch "${FILESDIR}/${P}-qenv-lib32.patch"
-	# fix vso launcher for 32bit libs and linux kernel versions
-	epatch "${FILESDIR}/${P}-vso-launcher.patch"
-	dodir "opt/quartus-lite-${PV}/modelsim_ase/lib32"
-	insinto "opt/quartus-lite-${PV}/modelsim_ase/lib32"
-	# Copy over the old freetype lib
-	doins "${PORTAGE_BUILDDIR}/distdir/libfreetype.so.6"
-}
-
-pkg_postinst() {
-	elog "To launch Quartus, run /opt/quartus-lite-${PV}/quartus/bin/quartus"
-	ewarn "This ebuild bundles a vulnerable and old freetype library"
-	ewarn "Sadly this is needed for vsim. You have been warned"
-}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 584282cd16f9..ef156a2bd948 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/Manifest b/sci-geosciences/harmonics-dwf-free-noncomm/Manifest
deleted file mode 100644
index 2c5f59b725ae..000000000000
--- a/sci-geosciences/harmonics-dwf-free-noncomm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST harmonics-dwf-20111230-nonfree.tar.bz2 308689 BLAKE2B f268116cb49b3fe4bcdf7f714a0e4f8af17021e05c028abe2b94c3ac483c9cc1a309bd07e3b38d4e4ad186d9bd19e66e6b1c94526601fbbedb285a9bcdab0780 SHA512 53da55c37dfa1e5f9be1c46cd53d80208c2bf5a2af6e53e26c0dfe097d85399f503c8bed389d368e9183ba1b5506a9debdc3f2a633c6bfc6b5b188f5800ca36a
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild
deleted file mode 100644
index 4a08e6e7970e..000000000000
--- a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/-free-noncomm-/-}"
-DESCRIPTION="Tidal harmonics database for libtcd"
-HOMEPAGE="http://www.flaterco.com/xtide/"
-# Even though the SRC_URI is labeled nonfree, the data is actually available for
-# any non-commercial use.
-SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-nonfree.tar.bz2"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/harmonics
-	doins "${WORKDIR}/${MY_P}"-nonfree.tcd
-}
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sci-geosciences/swmm/Manifest b/sci-geosciences/swmm/Manifest
deleted file mode 100644
index 25a31b604469..000000000000
--- a/sci-geosciences/swmm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST swmm50022_engine.zip 338011 BLAKE2B a3fba4a480130903fe576ed1521cb94f54dbf350ec4200d96def10bca6842d55a1de2d17911d35b59acff70d13a31012554ca09b0cb7ac7e60f0f4ebc2e0ea98 SHA512 aa424d36c062656611bc6d6e4ced3108b6fd05806bf47ace30b44cc631860423073ad4fcafb523b2bf0ce7c73c5edc4386e5129009984d3d34f34e9260c69006
diff --git a/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch b/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch
deleted file mode 100644
index c84d50f5f6b3..000000000000
--- a/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -7,9 +7,10 @@
-        rain.o rdii.o report.o routing.o runoff.o shape.o snow.o stats.o \
-        statsrpt.o subcatch.o table.o toposort.o transect.o treatmnt.o xsect.o
- 
-+LIBS += -lm
- 
- swmm5 : $(objs)
--	  cc -o swmm5 -lm $(objs)
-+	  $(CC) $(CFLAGS) $(LDFLAGS) -o swmm5 $(objs) $(LIBS)
- 
- swmm5.o       : consts.h macros.h enums.h error.h datetime.h objects.h funcs.h text.h globals.h swmm5.h
- climate.o     : headers.h
diff --git a/sci-geosciences/swmm/metadata.xml b/sci-geosciences/swmm/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/sci-geosciences/swmm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sci-geosciences/swmm/swmm-5.0.022.ebuild b/sci-geosciences/swmm/swmm-5.0.022.ebuild
deleted file mode 100644
index ae8ad8060a90..000000000000
--- a/sci-geosciences/swmm/swmm-5.0.022.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
-
-inherit epatch versionator toolchain-funcs
-
-MY_PV=$(delete_all_version_separators)
-MY_SRC="swmm${MY_PV}_engine.zip"
-DESCRIPTION="Storm Water Management Model-SWMM, hydrology, hydraulics, water quality model"
-HOMEPAGE="http://www.epa.gov/ednnrmrl/models/swmm/index.htm"
-SRC_URI="http://www.epa.gov/nrmrl/wswrd/wq/models/swmm/${MY_SRC}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_unpack() {
-	unpack ${MY_SRC}
-	# Need to delete Readme.txt, because it is in makefiles.zip
-	rm Readme.txt || die
-	unpack ./makefiles.zip
-	unpack ./GNU_CON.zip
-	unpack ./source*.ZIP
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QA.patch
-}
-
-src_compile() {
-	# 'sed' command has to accomodate DOS formatted file.
-	sed -i \
-		-e 's;^#define DLL;//#define DLL;' \
-		-e 's;^//#define CLE;#define CLE;' \
-		swmm5.c || die
-	emake
-}
-
-src_install() {
-	newbin swmm5 swmm
-	dodoc Roadmap.txt
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 429fb68c882d..2abbc1616b94 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
index 7131f14b3a7e..5d9c36f255c1 100644
--- a/sci-libs/pastix/pastix-6.0.3.ebuild
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/${PID}/${P}.tar.gz"
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda examples +fortran int64 metis mpi +python +scotch starpu test"
 
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0576184b083b..3b85d60c0251 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild
index b77a3e7d7583..96c6d880b230 100644
--- a/sys-apps/busybox/busybox-1.34.1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 5c47084a57cf..62612afe8dcf 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1,2 @@
 DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
-DIST cpuid-20211031.src.tar.gz 124390 BLAKE2B 69f15a7a6506728a1049be58be43d6b23901e7a2347c4804cbac036fce10b9231df59dc6e49c07b6e66598c4140df8c73f7ecd1567590f30c1b4e79845645715 SHA512 a3d0782980da66e2fb824a907e90f81710a86c8bce110f4f027a4a0146fbecb7005df61dcd070aba3cea8bbd9d58cfb0ae627c7e4d5f3818f305c31600ee65fd
+DIST cpuid-20211114.src.tar.gz 126084 BLAKE2B b328b0c62ea20b33cafd4b87f3a30b0600aee3ed787c235a76d8f6a7f787043d3507e62128110d78e0c0d37f4f975b65eb1d5f1c741466011b95e68c69483012 SHA512 7c74817d473fe7388be40b82b6e7af4f2620cec2bb7dc10ef603d1526e9fb095bf2901746dfae650e82ef9786835949577af56b01a10a82881cc539df448c5a9
diff --git a/sys-apps/cpuid/cpuid-20211031.ebuild b/sys-apps/cpuid/cpuid-20211114.ebuild
similarity index 100%
rename from sys-apps/cpuid/cpuid-20211031.ebuild
rename to sys-apps/cpuid/cpuid-20211114.ebuild
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 7137d9ea6d6a..bd8def5bc884 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/fprintd/fprintd-1.94.0.ebuild b/sys-auth/fprintd/fprintd-1.94.0.ebuild
index 88fac27dac57..845933944122 100644
--- a/sys-auth/fprintd/fprintd-1.94.0.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/libfprint/files/libfprint-1.94.1-test-timeout.patch b/sys-auth/libfprint/files/libfprint-1.94.1-test-timeout.patch
new file mode 100644
index 000000000000..cc5080e2a140
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-1.94.1-test-timeout.patch
@@ -0,0 +1,15 @@
+Although most libfprint tests are vert quick, several of the VirtualImage
+ones come very close to the default time-out threshold of 30 seconds.
+Increase the relevant threshold to 45 seconds to make those tests less
+sensitive to CPU frequency, system load etc.
+
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -88,6 +88,7 @@
+                     suite: ut_suite,
+                     depends: libfprint_typelib,
+                     env: envs,
++                    timeout: 45,
+                 )
+             endforeach
+         else
diff --git a/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild b/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild
index 3b98a35777fd..111bb50e898d 100644
--- a/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples gtk-doc +introspection"
 
 RDEPEND="
@@ -35,7 +35,10 @@ BDEPEND="
 	introspection? ( dev-libs/gobject-introspection )
 "
 
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.2-fix-implicit-declaration.patch
+	"${FILESDIR}"/${PN}-1.94.1-test-timeout.patch
+)
 
 src_configure() {
 	local emesonargs=(
diff --git a/sys-auth/ykneo-ccid-tools/Manifest b/sys-auth/ykneo-ccid-tools/Manifest
deleted file mode 100644
index 2747cdfabf62..000000000000
--- a/sys-auth/ykneo-ccid-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ykneo-ccid-tools-0.0.0.tar.gz 298831 BLAKE2B abe3cf35eab7afae56e16665735f8ce5aa436e8d1a7b98c7ac5f88a129ad2cb4331e40839c017b5384f442b0e365f7c0f414abe8dbcbbea5af08f13d8b3f5a54 SHA512 735fbdee9e307b8fa1304b5ebc1fc490807e3b4cd67b62c4faa100fe9ac2915b8c1c979820078e0035ddb9d304460c7bae601ad89f358101faae2f13d066d864
diff --git a/sys-auth/ykneo-ccid-tools/files/ykneo-ccid-tools-0.0.0-string.patch b/sys-auth/ykneo-ccid-tools/files/ykneo-ccid-tools-0.0.0-string.patch
deleted file mode 100644
index 7a4b70b82f82..000000000000
--- a/sys-auth/ykneo-ccid-tools/files/ykneo-ccid-tools-0.0.0-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN ykneo-ccid-tools-0.0.0.orig/NEO_Config.c ykneo-ccid-tools-0.0.0/NEO_Config.c
---- ykneo-ccid-tools-0.0.0.orig/NEO_Config.c	2012-12-20 21:30:44.000000000 +0100
-+++ ykneo-ccid-tools-0.0.0/NEO_Config.c	2013-08-12 16:40:18.109041000 +0200
-@@ -9,6 +9,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <neo_if.h>
- 
- #pragma pack(push, 1)
diff --git a/sys-auth/ykneo-ccid-tools/metadata.xml b/sys-auth/ykneo-ccid-tools/metadata.xml
deleted file mode 100644
index 29365b0cc2d3..000000000000
--- a/sys-auth/ykneo-ccid-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">Yubico/ykneo-ccid-tools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild b/sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild
deleted file mode 100644
index ad5468406fe9..000000000000
--- a/sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch udev
-
-DESCRIPTION="Tools for Yubico's YubiKey NEO in CCID mode"
-SRC_URI="http://yubico.github.io/ykneo-ccid-tools/releases/${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/ykneo-ccid-tools"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE=""
-
-RDEPEND="sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	dev-util/gengetopt"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-string.patch"
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 573238d6ee8c..f068c77bd0cd 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
index a3181043f9fa..d1da43785931 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapsh
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index e33078e8ca29..e52f81c752cf 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,3 +1,3 @@
 DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
-DIST xfsprogs-5.12.0.tar.xz 1299332 BLAKE2B 96e8831ca83d362792853188939017b53343232c99ed514fda50ea9afa828ea8f8ecc753249b211037c2635b45bfbcc849f90fe277102e4745e6b4f13fc6fc20 SHA512 d31263529cd5e0aad2b4414aca91f352c6df9de9a241655e43b5592a3ca120efdcfcd8cf84401ebd1b3fcf67027f0923fecc6f961bdaf12fb00c3ac67abd5fe7
 DIST xfsprogs-5.13.0.tar.xz 1301112 BLAKE2B 49e2b8535ef778362e68d45b1fb6f01be354dbee48d346c018e75ca1a5bc8761f47e65199bb62ffc4962faf8e185f3579e34e0562fab346d9839810727110665 SHA512 8e21bc43fb5cd49dccd6415b86f9e146d29c265a5d908f6898673290d6a2ac4a00bd25440fd7fab5ba080237d4bd54f56855ae64cdb32e59edae100b96155ca8
+DIST xfsprogs-5.14.0.tar.xz 1307332 BLAKE2B d2177f10d677e28439cef1db3ca6a2adb93f89f1f415b2b564ec694d80a0b981ebd283d33ea21573ce2e7405da8235bad48df3ca43d37a4294de60ca95380ed1 SHA512 dc87840c05bbd3f6ba64bb61f95499d58eff1d4bb2309ed223048ca0e475f5bb139f03c47f415a997576e5bf85cf06b1a040e022397d6f0bcd5ba60b36d8b0a2
diff --git a/sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild
similarity index 97%
rename from sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild
rename to sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild
index 030c8acbec7d..2fe309ad43a7 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild
@@ -11,11 +11,12 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="icu libedit nls"
 
 RDEPEND=">=sys-apps/util-linux-2.17.2
 	dev-libs/inih
+	dev-libs/userspace-rcu
 	icu? ( dev-libs/icu:= )
 	libedit? ( dev-libs/libedit )
 "
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 178c2c577084..79b2aee03163 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8e8c336f9bcd..9f222c5e1214 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,121 +1,34 @@
-DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b374477e16c9eb0da2d6f2118f259034fe2d02b3941cb0a36780bb0e123f60b2b62bff89dd058aec5aa050f7ab407361aaa68b SHA512 3b5584878622d899256a554687822279f13944346c3be25b2836c480b2b19c9a875f93400bf34896855f29c28b31aa8b624c1802b99db7ef3469f3508f3476c4
-DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
-DIST genpatches-5.10-81.base.tar.xz 2412768 BLAKE2B fe3b30c2ebbf250eb62c5add14310326a72f01705c010b202768f37a29e6acff39bec319d0629450c0efd3dc69e414a0b6e541d95283f619e5efb425655d8329 SHA512 544e4af48bc55de74ea145a3d01392ce8742faa88580946c16530575512d8f0b7a6e152755c7bd96548080dfc5758a5a33d6b826e97f75a783e50f361f1852d5
-DIST genpatches-5.10-81.extras.tar.xz 3844 BLAKE2B 9774afc1d893bfa0439cebb0d006cf1c0682571668e09adbf97df38c159f016176b8db538562e896a3ef0380e7ab830503d952d8448b2bd02adb22e84cfa0bea SHA512 c450131db06e63521ec0455a76bd4005f62527e92c0971b63e7076f4fdbae41aa6f4648dd5888bcebaffd41c3c5aff99d99efc0531988fdb54cc9bd3af1bcf96
-DIST genpatches-5.10-82.base.tar.xz 2436944 BLAKE2B 1ec08fa67b8d075aad46baee204f9965cba2a219c3c237f7310be5c23ec036f2a386488199ed09eb348a4f0575cd48fd3e14b90316e12a00228589f7e339fc20 SHA512 8b06790d5ab0dff514c0c03c9789537ee9ff75deff4a89e725df78a023bc29501c6c4d8bb9acfc4179bc530b021fdeddea62499d9c43cce842a49bc3b445f863
-DIST genpatches-5.10-82.extras.tar.xz 3840 BLAKE2B 013a2c13750a9d235477f5af6f42fb80703590db72ff254d1fec54957dc7a8eea7e1b2ab430c7a375699edb95c1776dd454b42add5d2ed78a65ea90aad58c831 SHA512 6d4eab6d4dfbfaabb1a117b2844b1fc110b4c7ea3178acb114c3ab862765f46d2fff32cacc3cffc50429f926cadfd479abf56332cd3630f734852e66139f5411
-DIST genpatches-5.10-84.base.tar.xz 2456624 BLAKE2B 601a384268e27c058a4e7ac17f7d1c29463069b8f1ba37669015170c420605f91b5d9780c308dc5969acf6a619fde60876a7f0f6507906849ab4f2f0916aec7c SHA512 e6fe9a033bb3ec6fc3274b033d8a68fec7dcb1acceec654659a06785f87eadcf8102f1ad2eed00919ffc16b73abd156c845a675d036d9e11b5a7c264766356fe
-DIST genpatches-5.10-84.extras.tar.xz 3840 BLAKE2B 77bba1e9fad26e7525b6d3ccb27b2aa0a17c08d21e5a05483895b17babd11a17d280a9c32375cd1b8c2ab8b3875dab7b519ac490c1e189d5df05b7b19c3c74a9 SHA512 1c99561593dc8097d7626efe9eaba1712353bc3ac72780edc515833591b02f90034f039e904f2057b7ab56d142c7716aecb56edf0cb656d474246a6ed0438efb
 DIST genpatches-5.10-85.base.tar.xz 2458980 BLAKE2B 56a0fe583f9db1bd5d1a051c584d1eedd1ac5fe756aea67b51aaaea798ab10669ed2213f0141e1cfb9ef47b7200e35f266c755dcc164121f5d8e7578a31b7935 SHA512 c213cecaa7f30b2beb000073520e3b2dbdc3f106c01cdf166a77af6d795b9ff77f1a05e0fcb0d3d0855fd46d54a1ca0f2d90d8f6dcd4c763050ab34462199c59
 DIST genpatches-5.10-85.extras.tar.xz 3840 BLAKE2B 42ce8a5ec14ebdb8067853fc388b30e178e705e53d6ca547e21ab76bf94ddad1368000226ab455116758cb6ce01e8a8624332dd217b2d49d6ab3393d6f740966 SHA512 10bb7747d4d23203c39cc0f15abc70e5dbe8f3e390b2c95338982225634b3008e415c372b81029b85e0f6619112c65327e6acac5de0fa3cdf58bd8ac30607803
-DIST genpatches-5.10-86.base.tar.xz 2463088 BLAKE2B 34f37eca7a8880c76aac81efb164d5da205cbf9d958a1c678ea570349ef156d71ee49a6557f3c8a4229b7bc2dd22424bb0cf0f2e9b7eb404025640add9c1313b SHA512 133f1704d806f929cc8c4a800fcece05985c55f701bba05061f6413d545e40ceecad5f54cafb20d677e176339cbfc95f36e9ebbcb8177349de5f0666ccbebb77
-DIST genpatches-5.10-86.extras.tar.xz 3844 BLAKE2B 608aba1a5b2bedd005b48aa58d066cfcfe7f4219e89ee35f16ba25da443b9d224aab29986623bd640565b90aba1f5bd347a278d55f2e8a23c876fcebbff4444b SHA512 848711bf665668e7023ad26327b2a15863eade161330885fab8b8d1cb3b0d59568c3bc7a780f172178d526de704987bea50fe319a12a68df60c11761250f3339
 DIST genpatches-5.10-87.base.tar.xz 2594680 BLAKE2B ee5823f80add6faad8cfea1c36e3597ecc0292c5f98b64844fab7c76605fb369e07f4ae48b2e39d3d17879f0befe37cd58a45734c47c73c7572522afb01cc6ad SHA512 15b8d5e3e8403c4c9139fad59382e37a5e211ecec363c43ca385b529fc292a0439c9f93e7b525949bf1519c553111acc96107d0195e11cdad77b03d905bbfdd5
 DIST genpatches-5.10-87.extras.tar.xz 3844 BLAKE2B 7d06efb6943f262cd37cb9c93ed4b0477943fc267499a80fcf1a419641286c072fb8cc7bdb061593be0861e437bc347e9cb4443257fa40887c0875780c76e80e SHA512 c3331486191e9e7e51dd4bde83c2f9a3c76f7753f0e2ff3b1c0dd661e8eb73d39653efdce7e084aadffb55e840de84fe2f9a4878101334bdf0d52e2389e67156
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
-DIST genpatches-5.14-15.base.tar.xz 544344 BLAKE2B 5315b7c850517e559fda958cb73d9bccd97945fd23833f901f81f21ec0b6a114ecbcdc6188b7283f3daf2c2dbb77b470fe4dbd15e6197dbecf1c026aba0f09b5 SHA512 963eb0f6ee49360b041e748bf096ccb4e92a075de029fa65884553f3372c34181f3cd1b1d10c55893df0efda0d4e265cc410ee2d5bfbb6a4dac0be98dc86a638
-DIST genpatches-5.14-15.extras.tar.xz 3840 BLAKE2B 824c2a15749f6e83b03669df117a0838ef955430c4781f5b1423d6a5eb4d3b594c99bda3220ceff3875b00601bf2564eb211ee470a04a7e221f5300d0552adf0 SHA512 197bbcb69a9e79f7938342a7ec2d8b6baa55b48f121ff5bef6d8a3969e41a646fa357cf394e9fb3e8ac6c43338749e8be8b50319020564eff5c30b49786978f1
-DIST genpatches-5.14-16.base.tar.xz 591456 BLAKE2B 5c2faa9bbbc7c35b2c81d2cc3f11e61f3e69964187abfc70301c33fa58bd4762beceab0c298c0b16468def49482d4a0b32c93add83f94bde6e930284f7fc2922 SHA512 860f2cea8a95cfdc0e1524baa5baf168dcd06309a44319503ca0768b611118cc9a654eafc6ac22c2fe5d1a33954a27e7c53a55480e64310442a9a8e279f3e2ba
-DIST genpatches-5.14-16.extras.tar.xz 3840 BLAKE2B c36321060c45651af5fe20fd7bffb8cc2c2cede11a9880997381acd9ab74a2ce99b89632c1061aa1542a6451a87ec4d7ad2536725bf429c243418e6c551d342c SHA512 bf77ba8560347ffd328b97e234d07bd1a8a22378e0209807b21b9cd78d458d4c3bb7a721583d5fffe919ff72fd3c74936dc5a97c911de1ffb35e8db696ff0b5b
-DIST genpatches-5.14-17.base.tar.xz 622212 BLAKE2B a0c5bcabe08e292287b57cdbdd573c8b61cedfc0560a63958ccafe2c1cd671b057b3faf6c4a577e9063b6eae46a1c6d7fb7e25ee92406e4a597ec0e74bb241d3 SHA512 3042091a962cd540b504570ab5ec11b3dda25b84c03529e78a01db232b4a0a716b9ee7b60352b7ad5afca7534af6ccdf14bcad9140ebd78ed56f292e47bf103f
-DIST genpatches-5.14-17.extras.tar.xz 3844 BLAKE2B f50d2d3e47b0e0387c68eff502be6163a167436f6e99a59a56420c1f4215cee35a892b95bcfb2b2f73261db57b52675f080e90a3f69512ba00163bef95cd8e94 SHA512 eaed5b496a124c94093d85cc23d73b345b9bc6b946656fa9e8f3d7eeff719303841f199d9d1312b4d8b69e7f55883a3c8961d3cd568c5ac48390850511c936ad
-DIST genpatches-5.14-19.base.tar.xz 626596 BLAKE2B 8edc9633b2344dd484c39e12ca58b7eece9e442ea6440f7db647c9bcb11ffd72d8eca9d770fd70b82ae61bd38f58613b78be84aaefc18d3edfca7a965654aa3e SHA512 7a6b1bbc2d6badd509b1c0c1106a13eea7b76e2d11e52fd8a805d811b1014a68b6a2dafc95c128c20dfb64ac0db2b71f5b404e7392917e997c585ce5af2234f6
-DIST genpatches-5.14-19.extras.tar.xz 3844 BLAKE2B 178ac464389a96c166e30e5fd16c33754722c74d7cb63f458719fdcfaa582c21d18c983cdb96747d331c1f1911ea8de16cf812efde0075eb02164201bc077be7 SHA512 132393c3e483a1142e240941439137632ed153e14b9320dcb8cbd41115781ee2874954d87463ae0c6154029f078d4b40e1ab63d52ae2f48a733f86cfce677e13
-DIST genpatches-5.14-20.base.tar.xz 634440 BLAKE2B 44ad4acf9c899d22a6f02c722ae18a21796adca21e62208fa5f70e3b131a5e3cf92ae2343e0ed7b86f6dce99bd52521acb619f6b6c603b7913c438be13f06547 SHA512 03557b7ed31a079d1e8a5cd5a917c517e68c88337d5fa61cb528bd39837cb6cdeb74f9e9648ac3a41f9ade4edb5276c94d9b56fc72131814d5fe3daf3c72f03e
-DIST genpatches-5.14-20.extras.tar.xz 3844 BLAKE2B 26b9e372ce744f8a6af8858edbdfc23be85123ba6de3d273d11ce67be3ba2bad1c4c7611039bfb41796bf49de14bd5c2769cbf49bee4cdc0bf5148d34261cd47 SHA512 c51a656e02e5438d61eddfae64c7b62277e30c9d1f8e1d563f812d484c931c37de5a04c4ed23afabde7c39e3e2844aeb25923e7cefc1a948a6617bd9c72277d3
-DIST genpatches-5.14-21.base.tar.xz 862764 BLAKE2B 9ac9818d497117fd980cf21959aaa16eba144b7b48d5f5a5f0ad33062b83a6f1a6f15174a2eff71959e31cde4bc68980bc47378b30e6b1b72b2503e4cd7b62d8 SHA512 483f4a6753d56197ab16f7ff4c793d5cc6413d87e04d848ae48c856fcb05adc1499ea0a4358806198841318497f99b49adfde991df6436b646a0106db28ba4bb
-DIST genpatches-5.14-21.extras.tar.xz 3840 BLAKE2B 32c192fb758d1f9c232bddfc125f2fbaf1ae268c204f1fb1c6ca5651e90b95f9a7cfecc746d7a6a54d02ff7ffd7da3b077d60f9830371c391ac5b8d4b415dfb8 SHA512 3c749cd0c4a19a3c7c26eb7e56a444e56170c5de2205085857fe9df23bdd624220a2fb531b5ce8c58b9636fa3430c6036ab860edd3c34c5ff15329abf042e2b0
 DIST genpatches-5.14-22.base.tar.xz 864000 BLAKE2B 0a2ef4aa3504d23bc2ad1047d76d705ef4fb15e15ccfc59f343bb1f817ba98940d9bcf7151cac74cb02db4e946344e43679ecfd848aca65951764ede5288ad59 SHA512 b597484d880cdcb1e8e7450c48cb5ca6a5902109182ac01725be00c264450e7e0d24e54940d3d55084383725398ee05159dc71ce7c152850a57aabbe5c26b1c7
 DIST genpatches-5.14-22.extras.tar.xz 3844 BLAKE2B d8934cf97acf49434a817afbe3260da98f3bf52c3bb93d09e510d5c90b592af25da702cb1d6cb2c4ca463428bb35b7aba248f13ae48c094544460650c0d7da6f SHA512 d33c4adac4ebdc6a122ec60b37b8e8e1b3f8b47bc6808707c4fba9d2c8d89ded193bfe0cb0929c23fd0fc82ea1cf3d11fa739555606e6313712265e84a7cf033
-DIST genpatches-5.15-3.base.tar.xz 9472 BLAKE2B 209b41dbff1afc55ce8a56332805019848e52d736b90806cafdf966d73f278f301ec466078b6b17c3d558e976c8ccf950bc802e365b06e412bf4f08434b7a9e8 SHA512 fc489ceea8f768cdfca365fb821e7234e7e3a9e650170e81e182b96754494f840971acd29c0902cd1ff3d192dc059755212d0618118b63cd1b62a822182bddf5
-DIST genpatches-5.15-3.extras.tar.xz 3840 BLAKE2B 9fb781e2ac7afd8c56ec3af5d4dc8ba8c1577716b429b04d81cf070debd3f8762933a8388e836007ce4fff0a10be76f97e9707b6f2893f1767e105169b0a3c41 SHA512 93191bce6b2c6d029b1a703b9edc77f8f9567b791a425ad9e4be108747f398083fa9adf0a4dcc92b5b140f60fdf74ed59260ca7bd630837a88bd4645812dc94b
-DIST genpatches-5.15-4.base.tar.xz 20904 BLAKE2B 01add5a35e7eb969a41239254c8a5f3a70f7ff2775e2c3b8e6c3fccf756795a11c5645c0382c03f8225a36231671570cb984382355844c080c7607dc4a5901cf SHA512 6482bbe1af3c60b065541f6cfe1eb44e4aa3ef375533397c58372ef68fd418dd1eac21d2505d78950953c833a28fe2a03105b6ee5f7128e4685d7f4f568a596b
-DIST genpatches-5.15-4.extras.tar.xz 3844 BLAKE2B 211e9120645bfaf52f6e4f23b16775ea3739bc75795ea95f0795b1289f207116d3c9697a7dda3968c1d63cd1d66d097c94888789c7a5e6fcd837d8fe78aee295 SHA512 846b56ae57977c1184148bb6cbc22da2dd7052e68446b963f149e3bb8bca2f759f1abc71198d10b8561a4cf594bed3e6936836bab17602e1d4174e023e1f2514
 DIST genpatches-5.15-5.base.tar.xz 294364 BLAKE2B 59f372c304cff219647a6bf84965e13ea13b0062be222109d3baffb2e243a93905b85fa336a1592fdb2bc48ddb29a34df9d139521a258d56c363e5021f34689c SHA512 4fc8490701f55113f51314805114d3c225525b2464addc29642d337f6cfc5797bfcb0052a7f7b4045bc8b2e48fa673f5334f1c10fdd3df0bf7bcfa4bd022e36a
 DIST genpatches-5.15-5.extras.tar.xz 3844 BLAKE2B 95d55709e177684475f4b580be19811636591f6aace5eed83e61ee2939325596b3e1896d9e573e4c85cbc991f846ed8a916c09aacb1aafdee7dc011f08034729 SHA512 ce42eba5f5fabc2ab20124b2486ed458ea503af43e18f31c2a9a87f8a3872354dcd589bad2ac3fea8bf6c11026b6c9165c8de9c5c71e7a03ba719cec5ab6ed60
-DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432 SHA512 bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
-DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
-DIST genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0 SHA512 31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c
-DIST genpatches-5.4-159.extras.tar.xz 1788 BLAKE2B b3bdde65db00da9eaa5e9d3e1a813bca63304608d61af3c4712a5588fe946a9c53974066467af1678cb7e44646dec35ea607133911f1da2e8a4320118cb44431 SHA512 72353c4e7a35c2513bc9d27888050de1446ece8cb9c079ac03ff90cd855070c31001e37f741c42a2b3d2a76890913cae9cd12b19f2250549273b47667b55435f
-DIST genpatches-5.4-160.base.tar.xz 4078816 BLAKE2B 478bc44ce285e02c37b4452fae6948ca61d0ae841328444e91403a517d398c416cd91a232d057c27a2c3994df19626475566e832457310744d20b700a854ab43 SHA512 ab1500a95a8f9295a6f5ebb7f9c0beb24bf1d0f6d67ca03e1135dc6724e74fe33f5025fba96ba2fd1d96078a20e5099ba1c1e0f1be149d01ebcaa991ff5c2dae
-DIST genpatches-5.4-160.extras.tar.xz 1784 BLAKE2B 8184089c122bb794bc18181ed165b2d03b301f336730b3579c92780b8a551d75963051a0c3c2ce8015a8e7102fda224e7a069ddc5fb5ea90d313637879602270 SHA512 f304a0b349c1a2f42297595ef732a6e31a7babfc71031b56e7e81e14b030cbbcefc25b49429381b47bb60676f63a3ca86b24de333a4ca928825fb2fb59109839
-DIST genpatches-5.4-161.base.tar.xz 4088312 BLAKE2B b9c445ae9e163ed0d918f2833db1ff0683144d8214f7bf806a4e99cefdb33ab0c5968f6c70b9f0e15c22234a6f438a97fe566a6b04bb9dfda7d177cad98b1e6c SHA512 8e077b14090bbfc0f9c9fa8b01d3159317819b2c5f4903613d3bb3dc942ec47135a9f381fe30c5046f2fc640e35bd9f1aab8879803eebb46b051ada5d958dd43
-DIST genpatches-5.4-161.extras.tar.xz 1788 BLAKE2B 940f21b0dd0a57c70a42aac772114e16bdfe3a9ca4119c3b2ca24c7023eed73f646250bbb74f308ec33ec03ff7e0b8b73737e50436f4f0ee68344abf93e0bc2c SHA512 97ff320e68c7cc2b0467e0b4be63b5d95509ff784a98de7bca44f60db9baf31ebdb9d45cb122bd75ec87e9b9daea17b4388f552b520d96ead0e4b5975945a065
 DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
-DIST genpatches-5.4-163.base.tar.xz 4096836 BLAKE2B 706872ed4c8c5fc61e1165bb4455f32ba7e425c69ea925355286dc0c9cbe869ae295e02d79d4b2dbfb80f85ec0ca74a3d91c668de434668522a5fa6b26b9fefc SHA512 934058f21db89518828a5988c3161aac4ec38f119640bd2e29ddb8e43466d8fec056b94b81d58b8518b550d264885b723b33313e10afa3d75bf37aad5fed0b45
-DIST genpatches-5.4-163.extras.tar.xz 1784 BLAKE2B 8245663ee14482d5495bde82cc4f0bc3c37a9cd67991694b9c6790a2a9fa8fdd15f055ea8b1e61ff93e3f1ef769b110ad64fa9a64e906b9a3cae64d7ed4e0fff SHA512 af68646411a8e730fc59f11c5d4cf41556bdf98c4afe524e7d2f7e022240403096d6b744e801a02e6fdaba89cca1c1e098ed5fd1ec7971475cd95b21c06db8ea
 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
 DIST genpatches-5.4-164.extras.tar.xz 1788 BLAKE2B a1c49d863d28e352a89a8ef344e2b9fa7d634147190ef2886e1725ffa0a0acac0a8a1a8eca633dae7213e39f6030951c7af7828449b810d32b987ee8645edfea SHA512 841638c80395371d41aa45fc3cf5af0a4225e312495346514e078fe7d5e0d7dfc758e62402816ababb8f0df020206469920ec6b53fc71d3fbb6fe15cd8cb34ce
-DIST gentoo-kernel-5.10.68-1.amd64.xpak 65497706 BLAKE2B 526ea1fc91fc906828366b4f7c10cb04a0e1cffe19702443790d52ba82a99710aa9ce1eeb7832a0da9970f9ec073173c846d5872ade5ae6f44fb33c20b0c46b8 SHA512 6be46f7608dbe3ad05472264957b23e8a841ecab3a978ec94de8043f864a9e9864e8086f979bf185010e65bbec23af941eb3a82828c3341da9a365410c85a030
-DIST gentoo-kernel-5.10.68-1.arm64.xpak 61234698 BLAKE2B f30cf0cd18711f3b42d9bfcb528ca56c7bafb88477414a3ed6ecd9c26b66fe76c1c1370461c3b1b83a13266240a20f55cbc35fd68d66bb8ca20503cc26f91f15 SHA512 df478abac49f43635cbe7b79faa188570cee3419d920877f05346fae7a3a16333f95c778d170b509277a0ee08c08d73589a177b69f86fdcdf800bde8481b903c
-DIST gentoo-kernel-5.10.68-1.x86.xpak 57237230 BLAKE2B be3156a79fc45bac92220f715e0e7270c060545f222d01fc24ff5bb6a239d8187077f6c4beba1d18c704c6e858f36b22db6f1ce9ebc737e574e9130410d5c813 SHA512 7ac97263d05bd70b29388d749786788124c6e636a3b1e975df8c9225ad3106d66a93898ce1e6cffefc4ec948a36830cfd3ae16dade66d3281bfebdd3a2bf6f7e
-DIST gentoo-kernel-5.10.75-1.amd64.xpak 65510827 BLAKE2B dbca97ddb2197b77dedc46b5da6e4239640268468bb491ed5a001a9e8f7b2354cea75533b5202dfd05356796a30703c23be6975108d850efd228871054f8fc78 SHA512 39673aba230f8882444adc4ba8d77697f02e08915808ebeb0c71907b7a5a8bd750357dc266d5b89165c0bcc47126f7ea7be15481709bb4bc918b9dc15c94187d
-DIST gentoo-kernel-5.10.75-1.arm64.xpak 60915641 BLAKE2B aca91e1da789c4128371172d7500f085c798ccc8c99bc66150d441fd4cf45822aec3a0c577695aed9979cc5f0b214b19b3787a6173f40ba8d792184a7c1cc086 SHA512 1be83f8088718660b0d4298092f8e7f725225e3247425f8da595ec772d9c80d57876379ca4e46b2a885bf2ff0280ade597b0a3562198aac7034d52c66699435b
-DIST gentoo-kernel-5.10.75-1.x86.xpak 57249997 BLAKE2B 0ef78af722f9c89b01c7d3cd1ffd8dfd10f2358bb62600e3210bbb18f71807f82bf442a3f402d5140fbb20cb1737291470551cc690916ec2b61e9a0d20f8df38 SHA512 08894507e35934970bdd6ab30725db71208abdf00e438ea011c1ecc4f57d5f2b7bf0a3375e0721b241af1e50f4086f4b1a503e5f38b4c1790e9251913ee0347d
-DIST gentoo-kernel-5.10.76-1.amd64.xpak 65516987 BLAKE2B 6219fef65f498cb77bed01c576d06a2088baafabe443b20f641422f3ad4d3e05a2ab51fb346f4e10d4462f677aa4b59306ff55976ec28141d317bd4254a03e4f SHA512 ee799bec44cc07a439f26ce9dda9676a67b05eaf20c16a4df11c9e1c752dc95a9f903ce9659217c3a23a7c4e45cc747f57b5c0a7a0c764ff4c9aed5a7021bf52
-DIST gentoo-kernel-5.10.76-1.arm64.xpak 60892400 BLAKE2B 00dfa37d735df4384d98ae62fa5b91cd07e8e61282b0c1fef503fd10efc075050ed6e66e201f13ffdb6fd64a491fdbf4f37d84ad85064620a6c9136fe53aa822 SHA512 41908b71c4ddc3f5c32573733665f14861fac07d4ff0ed47ad265d4eef9bba4ea1da7f680ebeb0d44df1c3ce4a8a4d49876669c000593b6999e3979dced80b98
-DIST gentoo-kernel-5.10.76-1.x86.xpak 57245227 BLAKE2B b770d80e40e87c8a74f1724a030f9b06ee6810e240da5675f6a83f38fc23d21d9ab736920fe2277cc5b41a17ca0f17d3b58351fc94c84b69d63da225eb69e993 SHA512 0eb636f8a4a9e9c6be8f94cfa74e7a62a43e4492034ad203dec9df8330e065dd9ca05a6ac2e3c11b6b057749ad631a3dc32b3da296a74ee13e25251494a44cbe
-DIST gentoo-kernel-5.10.77-1.amd64.xpak 65535606 BLAKE2B f6f9a289e77c9126a7b05cd427d694d798983fca62df11647a67d5caf579147201461e284e3a03d970d27a735cbcafa34101087bf537f3d04ddd0102a5559922 SHA512 c8f75a14ce93ca0edf0381778072d4f76c784b2ee120d621016eb41f61bc25fe7eb388159f371fba8c76d98085c260fba037cc53405b6da673b9f92fa5f6ba27
-DIST gentoo-kernel-5.10.77-1.arm64.xpak 60908355 BLAKE2B 99116acdfd9790281f2128d5cf54f97e27e38f7908cc9c1abe1751653e437560e865b89cafe3e292e5761ff3f4aeee95d02695447d0911d0d0491579fb22b8a7 SHA512 54c38926901b24199e90a744c1bd44c587cb6861aeafa787641a87c4382b41936e18e00ae460dd2ec7a3cdf3b13d9df58aed701bad548e5a1429b9c06be1703c
-DIST gentoo-kernel-5.10.77-1.x86.xpak 57261834 BLAKE2B 2c344b671b51ecff973dbe4fe62db1d541d76744268f867911037de8778af2c213302edf9f714a98eab0956d3031e7c12c4490eaf3a8c37d1b6826d6d14b81d9 SHA512 a6f071d54eefa72c3a6bb67fd09a4f6fe3e96b99fd4ec1d34be45d8eab0f6f690130c0d51c98e9d6b086c3bc8775592ca5e3fc3e993483e39f3562d8234c21cc
 DIST gentoo-kernel-5.10.78-1.amd64.xpak 65516317 BLAKE2B 444139b73822a88abf4ff033858cd4514f09c689bf68a24659477f5106b4faf89678ba7ed0b80c831d16456c04309bbfb1593cdcab9979991cf86052ffa9632b SHA512 4034c53b5c8f3dad7f8bcc146d3827978040daad6e05dbdd683202467a8ad62c29fa0d79236b1fdae404993f42ac301088f89605e4f6d32158cf867b498a8e62
 DIST gentoo-kernel-5.10.78-1.arm64.xpak 60916561 BLAKE2B 4994d703ca272c6ad296cf50c498e992a799e5129ff758c9797fbc4d29c5ddef3a865b529360b189c27c751213ac5f7d3822a9473f0596494c739ddedbdc6f95 SHA512 f1c9eb8fe6f3997ff90ddbcc9b7dcd6c7544edd69301da9e2e803a01d288c503269ec1295883975da3dbdc6928bd7a8e27f4037cfcb890545fe7d86db7df90d9
 DIST gentoo-kernel-5.10.78-1.x86.xpak 57263133 BLAKE2B d4f3ade0de191584fb2022aadf5223a917d77f8e0aaa885d919d22477230661a47c1e8849d5c78f3fd283097c2f509bf1e7db9e6a02bb8aa745a4a4fb45a1436 SHA512 340d4a59b417e872f0a2aab2b8b0a2ddaefd29abd3c51882f08bce93cfd72e44d2a4798e688a33e36162fb9cfc33b8c173fe0d4551e956ad7d4fec2ae7d2286b
-DIST gentoo-kernel-5.10.79-1.amd64.xpak 65535104 BLAKE2B 110338738477cce7cceedc9f7e5df68f781e8b1e44c579cb8b8ed6b9b20021e2c8e7820c61863c0a99a450dff50348872043a26229858e9686dbe108aa27d8e6 SHA512 3c3907b560206227df9b1b97e7f35e172a2e9ab98e1387da9d27964c4567783c22a21b870b11cf1bdea7a10f34debc9f100dd0875b6eea6af3dfa26072973bc5
-DIST gentoo-kernel-5.10.79-1.arm64.xpak 60978468 BLAKE2B 759f9f78e81b2bafe617b555a5164a8964e4a3abecff38e1de74b6e8103f30bf0110d698ba8979d628aebaa07cca9cc9b19993b02a02b489f2e5c138f02c408b SHA512 6a5763d65a5bca550abe52c7c846a41a1d2a3f3c914d08a7c7157b267efd614bc40377a19640891764bb4ce2f472327de00d1211bf856906dda1da4deb8700fd
-DIST gentoo-kernel-5.10.79-1.x86.xpak 57295318 BLAKE2B a3ce89be878ba48ebbe236532a0662897915ba9e84da4dd006e805def3039527ef39efe4d1d9c70d4e85f3c670dbe2a40dbae488b71c2e9b4ed3975ac802ffbc SHA512 b1abb1b5bdda8660ba461b7b21f9745705209c9aee994ff855ef609b982c23e01a6c055c7c3e14efa16b63f957b996a0b446fa9cdc098ebe34fa17465d66dd58
 DIST gentoo-kernel-5.10.80-1.amd64.xpak 65555264 BLAKE2B d1dc0d0c31ea77a806c0081ea7cf5c13b19079acd542eb9ce62457b8956755e70e75392b9315c93dec8ed5be990a76d3b832b01f7769977f3d8f48014dda9bfc SHA512 1f6538c49a78bb61c5dbd24a30c10156747b666fe90528b7dde58f25ac96032a7148cb65d4202e6f86e868870ca9fccfd469beeb00211ffff858de48f0014f03
 DIST gentoo-kernel-5.10.80-1.arm64.xpak 60925011 BLAKE2B 88684720fb6d4f9ca5927540de6dbe96b27aa0894756d8438947e5f5da909e1eace19a69e9f352a34cb4baa2a98a024125b005a611ee6cf9c8233df99323f17c SHA512 d74953b24dbe685e1933611cb1192fb96d45bef2429bf145f174448bfe0224521e2883e85616e610ba49fc9807572924f4e1c1e9b2d08437f9bac12ab474822a
 DIST gentoo-kernel-5.10.80-1.x86.xpak 57272943 BLAKE2B d2b6b55a4eb046efbb097508d5f8e96d340fcbc499452620a7150200978f7f80832a281db6dc147f1552419c19f3e1910b0f6cbeaf7baa45b1e3e34a0ac37bc7 SHA512 ec1e841644e9fbfee2fbf319048cb3c911a67191a8e0f81b57dc59f5b165f925b07588a2fe9669edd811f40231b59df242c064bbbdac63222aab94df7538c042
 DIST gentoo-kernel-5.13.19-1.amd64.xpak 67338326 BLAKE2B d9e718a94bf9a341f5b57063cbde2f3f1f0ea6d03f1805051c084b792388789494a49786d643f1570871ca2b6366a206497aed83f9ed00837c542ac970a71fc6 SHA512 aea74f6f39861752f7a5dae16d955d541f65d3e7b8a0e5fba593011d9ca8583f3dd0964e76aa21daa6583d5d26e3616885aeca8a04dbba222e0aae2a85062b40
 DIST gentoo-kernel-5.13.19-1.arm64.xpak 62747957 BLAKE2B 1981ddb4e35d2210e1c678856ac58e088cd100ecbd70d2b5c88ffe8eb25b56f3f0c90e45d12adb74c7a0fb881dfd36b1d46d6fdfb837dbdff1881ded066b906d SHA512 d8c1e524a3e58def5352b3faae07c42074a2d67015cc62b9601e20bb9b7f29d44d2843e7771e0399e9150be1de2be2b28776f96f7fe75ba7ec4e8f2c31e1f715
 DIST gentoo-kernel-5.13.19-1.x86.xpak 58517020 BLAKE2B 1dcd347af7693696f93f7a28326aff4c7936c4b71238500b6dd2a4b7cd2b88891436c7c8b7c6a56f638182b722ba5e75f52a1befc74eef4bfe9e6f6fd7d8ef8e SHA512 7bf1cf45d06cf4c6331d8d0c0378d253f6760dbd2f564cac6f7e53d30748ea01ea2d96a6c409a0d653ed74366d319e28ae1e2924b07f4ce7899c5bae121a3630
-DIST gentoo-kernel-5.14.14-1.amd64.xpak 68060210 BLAKE2B 979f550a50ff3a47e816ea61b5da162bd529a2b622950fea92ce2fd042afc5848468674a02b4b5eb94bcca40055270688f7fe20932708b777351d62bbae498fd SHA512 db752a617cbf86a0b483a2906765198c2b72bffd0a9b146a7ae751c48ca7f600352b173c0574b3ca71e9077183cb92f2b53b63d594d9f355677d1a4b63fc2cc4
-DIST gentoo-kernel-5.14.14-1.arm64.xpak 62976292 BLAKE2B 53877eabafaf39f7d1d6024e7dc3cdf07e78b3a94850f1765763b3f5041fb132d3d7d97a3f6b64cf5ad24195064de933a4e8dab62faf7c843d480f8c0c72bde9 SHA512 f4edba153fe521a5b358114c4faf84b1799ffbb5432b2a72d1f07c70b76f354169ae80e7052e6a6b725698be815073c902b91cc4c5f5fb64b8c5773b7e98dc9a
-DIST gentoo-kernel-5.14.14-1.x86.xpak 59175659 BLAKE2B 4233bbbca15ceac5a1b1e6880eb77f0838a7c6244d8f9ede2e5057c97c80b317572af6b076a51bd32f16bd4640c61cc3c5ef7c92f78d0f499372975b6fdfc2f1 SHA512 79fc5ca7ce6c6c9a06c48e0857e4d0a964f8d8ea42a48b4f336ac5b017bd3a8aadda7ad6dbdc2984ba8ff2b748df386e2b81240da20a55194947902485dce790
-DIST gentoo-kernel-5.14.15-1.amd64.xpak 68135693 BLAKE2B 4d1b3c8f095bcbedc67c33e79093ea53499fb0d31732928b9d2594bc3866d02a00462255f012e76f92f956dc3ffa4f226d0c4ba7e42c356d26173b0b1afd2174 SHA512 adfaa8f98a34edd81480b3648f0b9bc17cd2047252a8c7f52d64c4d3f042e6565e245a90e591e7106ef27504b65906da81ea4b8df74e6398ef3dc48247886e28
-DIST gentoo-kernel-5.14.15-1.arm64.xpak 63053059 BLAKE2B adbc13a8b046cd40da16d9902bfcef68347c81ed695af14445d526fdfed641d44635cc108c761a6056c4d485d9f0beaf80a1256474d427b6954318ca0b211287 SHA512 ed6bc279e81e80287cd5da69ae7d633b540ccb3ba219deb104fa04e0809734125d658ba995c39004a895bc6ab093c6d28d8eee6ab0d28e78d1669af5e4b8d189
-DIST gentoo-kernel-5.14.15-1.x86.xpak 59181387 BLAKE2B 635576604adee2b32c107ca50fb74a106fb1e88a8f4640d8e9660d1493b4f86870e429acb1a3b42286b1d0781b4cc2421b10f1cecd778c4505f6edc1bf05b728 SHA512 6bf1300d5b3bc7512184e5d99d7e7b69d354e8b1fba41e609ed0288bdf134a1951c57b75d0255633c70ec250d05e4a403c09be56aa16d5ead38bee2f1b1bbb88
-DIST gentoo-kernel-5.14.16-1.amd64.xpak 68131257 BLAKE2B 8dc482d683f804b840b9a78f36bb344a6dffb35678ea543467cbfd2bb174d4fa0700f891c4e4935e326d29a24603932b83824506e552c52c90dde426f1db10a7 SHA512 07ec41de81bc6fd725aefe3d5209d38e81bf1c883eda59eaceb82c618b872c7075794966add8dc86696cf26fdd9cc61847c694474361a6785ac3d8b426058d37
-DIST gentoo-kernel-5.14.16-1.arm64.xpak 63034327 BLAKE2B 27c1fdcd3b6df55aafcfb744a87215ab5643e07f8a1246868036257449e79d8eb18a67f2fa264526a5c0880a65ebaa9e1fcfd7bc9508211848c8331287937736 SHA512 274ef82725a6f6b6e5dddc2bdb6a05439f4cb4a69e16af5d52897de55cff8817fa2137eb0ad12186d21932a87d15c05a74968205684f1ab798428025938fbf7c
-DIST gentoo-kernel-5.14.16-1.x86.xpak 59189394 BLAKE2B 9ed0a856eeaa5a715dc0161d338f5d6fd009985068f7f5dc440c219eeae5bb7fb0e8248d15543adfc2aa0009417a6f9c5a96ed60485c1f0a30138f01b35c3856 SHA512 bc15228884dd481f01b53c67758191a01d1bdad9b566f7c818b1fceb5b38567490557817b09086c7075be252e1804ad05cd4d860dbca981ca51e8be0327bcb4d
-DIST gentoo-kernel-5.14.17-1.amd64.xpak 68122630 BLAKE2B dbb41103b0ae03250cb34a1b267a43068c2d8249a9d4d0637d74687c85be90e95d4841b4f752f2da7cff6f2cd7d9333b17c0e7dd21c17f986495c1803985e53d SHA512 0f0cbc76ce948279bc1d22139d34252f7ce22b9ac318a840458aacdb7f29fc1cc724eca8e7a3d987c69bc3b7387641267b0b8f2077bea0e9a35bbfcb23f8cd82
-DIST gentoo-kernel-5.14.17-1.arm64.xpak 63025950 BLAKE2B 63750480efdf04c30f54230907d5f193e031582dd94c199213ccd3ced454359f4ffaf4b514571b1c5908a4b4fc5238d45ba088f4aceef8bb3306424d4f5378b7 SHA512 29dc5b65dcd6e7e688ea6666d7eb61023f8181f485a593511cd27a82211a071ff9c52af38855fb022451c082e1d94e3cc06202685948620666e8be88287bea47
-DIST gentoo-kernel-5.14.17-1.x86.xpak 59184354 BLAKE2B d00d9aaf98e69f7d5345074b54f1af2340b78a26042aa09b7cac1da6d2573f553a65a9d72428467b51a2392e678585ca1413172a3facc7260ecd0355f3468e04 SHA512 50889944c47482fe3fd3a65ac2a9b45045d313f4410e4532900b57184122ac8b8494f2bff4b3168b4f6c803a507a09bcbbf7d47892a537dd8c06b795071d7a11
-DIST gentoo-kernel-5.14.18-1.amd64.xpak 68092395 BLAKE2B bfde18b37d493f50858550b84037bf156ecf0a05b1a7e894940ecc0fca5741f95cbaa8ae59ee93cf9a0d37af88a1e42fcd74dec166334148e1025b4fd329ff63 SHA512 c491f7cc5866cd215e1baa61a48aeb463b489f209161284a88289031cba21ae56bcdef0eb54390a09468a29776dc3913522229fa0c62ed8210e56a6648f9568d
-DIST gentoo-kernel-5.14.18-1.arm64.xpak 63088036 BLAKE2B 49e0b73ba0c6d2e06497b76d3478dfad40aa8ce303a05feb064c04d411ee6ea11270bd96bec6a405d4de657a72f2faa604d573e427f30376084ea9195fa26a2f SHA512 f357b7b07285c88d29cb83421816358bad95bf2436db05126557c3aba5fe6c97b11e90dd97c34e1b32e2ca6d99313606228decd8636aa4f3af650f72bcdc44fe
-DIST gentoo-kernel-5.14.18-1.x86.xpak 59188901 BLAKE2B 130d30b9d22ea59a1dcc78080f03cb195d6474c3b33fa648933db9459001e5ecf1b55406ff2f92d5902238ae627f596890080a769474b5a5406212169d2de68c SHA512 1def84f0cb7e5c2a560ec88a859cf9eaca5fc8c799552cb2d90ab761b52e02a2e7e41334665aa0867187b75cfc6585d730d54b8b9a1dc9424cf4e4eefc3a4f42
-DIST gentoo-kernel-5.14.19-1.amd64.xpak 68129075 BLAKE2B c931708e9f8edf2707ed5d98247485a23a8691501546620507154cf023154a4c3eedaea384a91c6dfeda5458a9eaa0a904709d06cb0c65326c3bd0ae45db7f03 SHA512 2a41317d2215c1fcb7ed2a17316a9246ffb9fa1f09d7ec3e5b99ebeb175ef8648f388dbef4fbf75b251439e94179e8373d5deeec82d9550aa9326c661fe72207
-DIST gentoo-kernel-5.14.19-1.x86.xpak 59191582 BLAKE2B 3d43805e4b1bcb333e87668ca2b836087a2a51272da19cf65905d9251b7be0b1dd36464c2eba7f6b0ec068e3291a73ea8bb80ccbde3d27ed320f74d55521744a SHA512 a266d1ed04171f09102006177970a7f385cfc5409d2cbde157581e5bec6b64e4532f581c662d12472589e214714e2d7371f9adb7ef7c6d655645d57fe99edc18
 DIST gentoo-kernel-5.14.20-1.amd64.xpak 68144100 BLAKE2B fef36b61841ab6f5bea3f304c10315bfb3afb57910968e1562b5e4dd7c5cda9d1fe7529b3b140cf32ba9cb753753c6216bfb1ae4b1099477cd23a6e312a4c37c SHA512 0eb407bf5e84b132abf238c38c842745ebd3f07cd3fbdcdc35912b47389d6a4595eddaf874a2be7e0204dfe15705e299f8e1cf7a56106631e2331244be30a802
 DIST gentoo-kernel-5.14.20-1.arm64.xpak 63105775 BLAKE2B 6a5eabe8c298a767f8058887fcc610cd3c59d70a14eea5a6ec9af5192a16136d0fac7103c1db6563ee922a6229b8a9be7762e9f47a57a9a4dcce41d45615197a SHA512 d155f1ec48deb43edf569c6be6c44b411dc41148bb393047df726a23ae128093b3f4337e35e9641e48849507b59e8f90ec974508fd5ca80b27ea0eb5df7e2600
 DIST gentoo-kernel-5.14.20-1.x86.xpak 59196770 BLAKE2B 53d9544223b5a2dff33e46d63c3b02f3f05ab4b1702780d3648d6d6c770069750ab4fc96f07b55cda993bd332a977db562456f591ba2890aea786585d6793c92 SHA512 6d7cf027e366c45cacd014252f9b79ac78cdc18b450746546ebbf8506da5361262795f2921b00485a1659a5ec7bf6498e0b6d4c9c19649cb9a17498687fc73f2
-DIST gentoo-kernel-5.15.1-1.amd64.xpak 68887176 BLAKE2B b431ba6e360cb987f6f72ec643762ffa9e77997c9eec3713be51105e362ececcc338410630383070c72b8a41a06b1660e414d41349e3dea0c6a9f2ce80383200 SHA512 80785b528d89c71c6e9ac4af3806c117025e6d21ff6bb5433fcbb1132c83341a9ef3cd6aa7914088a0f2d353f485d681d0311fa46fbdd0faaedb856e0cd03bd7
-DIST gentoo-kernel-5.15.1-1.x86.xpak 59745113 BLAKE2B a21641e1d691abbfd6a70b0f1b40d75480c43ba2a9625ce62945eae5685f39da0ef92f164fa443cfd0096bb670b4e7a537f2b566218cd2deb9c41cfc7cf8afc5 SHA512 4bcb87087cc1afdf6a3d8e61546ad03c231d0d24048029b684a307e4b7bae431156f9d46f03c0e35a62e0524dc0f8e4d7146c5c8010d484814e42af3ad3f8e2b
-DIST gentoo-kernel-5.15.2-1.amd64.xpak 68886163 BLAKE2B fb8c9bf94fd1560394e6683cf04396f958f1d1463cfb26849ff9fc7a51d93e9e7d2f616b9fe6464eabbc1820e3d0497d5fa4d188c119cf604057381daabf1206 SHA512 1d91f5f05ccf52b0d574583b86a82eeea8626d9c7d6ffb7121ffaf7dc71e475bf2ad4f722a9bcab38580ad315228c335679247e83502de85b8b62100fd14164b
-DIST gentoo-kernel-5.15.2-1.x86.xpak 59750714 BLAKE2B f3eda51fcb9fc170ae19383a83fa0c6a44073ef900209883b854aeba423f041c622898c42564e99bec853793f82c99212039047c4cebe4b34d095a22f018e1e5 SHA512 32583b4ed7f522ddbeb5b8317515d1cf8301e36e44465f663dc40989d2d623e3f43d09f38d7470664353e5f6f99c0f2279494fa8fa7af5433ee9b11b244d85c4
 DIST gentoo-kernel-5.15.3-1.amd64.xpak 68950522 BLAKE2B 513ed80336aa6d16af4a1341a715f43383d5e0926337eded78a35f749a028b78be98905a3af119fa7560347d559a225852ab34ca541092ee703a617c1ca1deb9 SHA512 9db9590dd30ca82a0cd914c869c46e041a5f3187ab9e318a836e40cecd6baa0dce541e6a2c428c90ebfbb8ca66243aa7a84af849bc0780e5dcc19937dd4e93ff
 DIST gentoo-kernel-5.15.3-1.x86.xpak 59771064 BLAKE2B 2ab6d9f879543e4c68dd528e5e11513512acae13d39856a8ea88c9e3bb114749d872ad22f485229cbd88b542a3e8c1789b71fe317a4547c7dbd545ada28e5d53 SHA512 17a5b0647cf1cca9c6337f48c9ffb280f339201648aa97581a562fb538f918f4b5bc26553f41cd9e566b3f2534d6533a8c101e4823f531d891c5f05f6b1cd03e
-DIST gentoo-kernel-5.4.148-1.amd64.xpak 61364378 BLAKE2B 2d5a665f5ccee0de5abc78d593b8bc6f1da0fa6fa9573ee9c0a65efaae9629ac3ea0b26a4b83e6abb23eee5fcb842fd67a395af35fb5476529b30dc0739d7944 SHA512 277064e06bdf25fc67f0894ab1d8116f23c71488b92a1751833c6aff684c7f2d28e2116e31d40878caa3f741fe9fe61f1f0c3cfaca4677298d2851b22afdf1ff
-DIST gentoo-kernel-5.4.148-1.arm64-r1.xpak 57998682 BLAKE2B a27bee25e2e6b2c0fea38cb5bee1ce433c6dbf10468b374ffb237a15403a4acb7feb0729526d337c5c9b1a85c4afc63716fa3c4b5fbe32c03ddb6966765f8946 SHA512 c72a4d8bc4bca7cf9ad5b594d7cadff11f9a4ec7181c0dbdce14919a1af50c1a901dd69b1a5d3f35abe51f9ca82f729f352ac8873d0b0f225e4bdd45a213b350
-DIST gentoo-kernel-5.4.148-1.x86.xpak 53159913 BLAKE2B 7269d52529bf78b43819ffaf435d129ad6982f8046239a15da5c6df359feada8793fed93b206e3aa031817fbb235d221d7468601f7091f40cf5bdd16c30100c9 SHA512 07c4e3b73122ac915695858891fb408ed17ba11ed8e6adf1e17b8eda6ec4112ef293db5154067dfbfd8d32ec6b1380797f87263272c1b16b6d1044476e054a05
-DIST gentoo-kernel-5.4.155-1.amd64.xpak 61371926 BLAKE2B 364a34d96863cb9dd697e12fff4cf9a81cfe83e11f8f07267bdcb8c43689535455961579651ec79d93f48747e1a7dd2efe81ddec4119091e93ecbbf53c418e63 SHA512 be177c4f0871bdff50fc6a61403b56bd01db1a5cefb4a489c50484e20d131d292924f734d66ecc1cd4284095b3867b19298b49fe0c3e05373a67100182ab2f36
-DIST gentoo-kernel-5.4.155-1.arm64.xpak 57596314 BLAKE2B d6c1d72d619cf66048928d3c901765a3443170ae7e77e0d444bc7cad30b0d985a90e056f45d1a50b3a942006c9a8770bd652ea787f22807813dc142712dc8861 SHA512 6cb7c28bd18e2a34d2cf316dbd5a09a066877151717beb25efbf386e50cbda1540e041b201286771ce4d7a814cc3f4f0e1442b67d3212213b047590a4176e023
-DIST gentoo-kernel-5.4.155-1.x86.xpak 53166974 BLAKE2B 635e9b254ad3393c546e8b7dc2934aae87f9dbe99faac2bf6852cfb1a15fd9dbd1c8149fbf07a008eecf5bd07ad5f3fac11621c2cab20f265f0966a887d25cd0 SHA512 ee47f76adf7658ae9154c12f499f58c8caff80f89b0dc9a1d0ea7a5c547d0fefb4779d4a99c3808010a25e0e04dc4facc3ae71d2c46515d690a5fb026695e1e3
-DIST gentoo-kernel-5.4.156-1.amd64.xpak 61386846 BLAKE2B 776ff69d5f7de04bacf1793ab74ea5143b2e9b11a65e06b7a74b298495c147e8dc2e0920082d5adc45362c4a8c3318887dbc70e071bc98b76e496e35506f8bd6 SHA512 1ab3772b4f51b829c5322605718e747cc08f44e48469c26cf1ba5bb13730af1c30ece760dd1dbd89d674fbe1e209595877b02334b7a1a78ffe418b43161f5c59
-DIST gentoo-kernel-5.4.156-1.arm64.xpak 57653246 BLAKE2B 6163d814d4ac0c0c7f0abf4cd5bccf4a8b2b2d4ffafc9850ffdb94cad81dd542601a667df7c8754307b8b011d0e8efad7fc06baded508eceada267f0ca0e11b7 SHA512 5d256be62768f435ca4661ece5eac8d28ee0b3a440ef879c8f34cebde9c38ab55885f9849e88ff645ebcb90476e1ade8d062befc6bac89e36722e0734cbe5ce4
-DIST gentoo-kernel-5.4.156-1.x86.xpak 53160831 BLAKE2B 0f615e5daf5ea0e86ccf1c21751973e735a57df77c4c6a77decbc4410f2abb57028b5037a390ad5eaf7511beb53f0030f9cee91f194619b7500d32f880cdd1e6 SHA512 34e0e6f4590252cf03f19b4c80d9b0c95237821d8c8f451d89cf0642379fa0a6cc8d0c012dd4ed55099fa56f466de78e0632fc0b11987615a5ca1df6b225f005
-DIST gentoo-kernel-5.4.157-1.amd64.xpak 61363009 BLAKE2B 98893eddbd303aaec3f2d3e6b0e5179d39aef30207db1414a997703323b9eaca5671cafd5ae9f42016a45c10158af8483f368a293af90a27cb3052e89625eaa7 SHA512 56258c1ecf93cb1f65bf68aa36a966c67c92770fba19603b169159d1b4b36eb21644ee5a54c4b1d318ff1a8c02a91fb9ed886756659843f6466c10be418d53ab
-DIST gentoo-kernel-5.4.157-1.arm64.xpak 57637045 BLAKE2B 1c641c638ea6e6285361c6de947015e866802035fabbb3adaa645f1c5bb56432eb9f9131cfd8286b4d257a250f2c85df687f2df64469599e51a5fb6626af0d8e SHA512 756329d52db77da7586100b778217fbe1e29c671283fb87c3a55be6ded1695f3f561a179c2cf21c80324205e2ab35144e0f7225fd5d8c6fe957fb3f61025718d
-DIST gentoo-kernel-5.4.157-1.x86.xpak 53194026 BLAKE2B 33fe49f1e94a0648180149dff4a803d16f8bd135949d44e7c652276bc797bf2ef6dfcde0367261d54559468a13b18a114ca13ef72d13f434868baac7a07b2964 SHA512 51f391a51b09a8ba4368bb210fc0d84b25c88f5af61fa619390236ac6be409f8db791cb9949e1243f5e45a5056ffc4eda25ffadbe82da3a32929d49350d8dad9
 DIST gentoo-kernel-5.4.158-1.amd64.xpak 61365744 BLAKE2B 985463752628a98755f7765199cafc22a742661e2b2b4754b0f0ee4d3d1d96ee890eccf099f26be3e58a3f78fe770080c9dfb83f0fee00c4c79c23717fa021e4 SHA512 3a7a4890768af369d07566fac6e75ff482c3488a246c95911612ece436b0ffb9c26c87ba951dec49fece3d5bef90a238fa984a494dd3dfb7460ccb8f01293ef3
 DIST gentoo-kernel-5.4.158-1.arm64.xpak 57629591 BLAKE2B 75bfe916311d6b16bf2b8a8f7a641b359b1f94b24fd35cc728e424f1df4e66579dc614f52b1fddd2cb1c2929b40dec26993fba8933a054a4d412078eca7a8eac SHA512 6b7cf2d6796dcdb567fe2c84a968726145e492799c7f40a92e501a84df385ca7da213ffd72799bae483558e7528029a97fb68757a9685272690dc2c88d70abe0
 DIST gentoo-kernel-5.4.158-1.x86.xpak 53194465 BLAKE2B 4419edde2a05c5c375e085026a85b314800cbe571fd0e30f0a2123adb6db1aff60f1c0ed60611ffd756c22a8b42b69382c15c4a59d9046781bf57b9cd83e764e SHA512 c8695b6a312bde4a9f2807f79547d58f678865bf7c18435f1fc98ea285b9428de6e60885b12310d92d2f0f50a694ec583ea42a69956e5d5e1496efb33d7de3d6
-DIST gentoo-kernel-5.4.159-1.amd64.xpak 61385281 BLAKE2B 9f9abff5de177f6018088753df8b7f1a49c2718f23bcc3d4a5590216b01908221af85e2615a51301eb83db1fde9c38762ee36696aaf51656e7ad4a716713aab2 SHA512 c2fc90e5b7cc16406d07c43b80e7a4d6a5be625864f7408d536ee1de4d78fd8d54d7b86e7daf82d45b502746e63acbe2d49d44d8474453623880c973c738c1db
-DIST gentoo-kernel-5.4.159-1.arm64.xpak 57715438 BLAKE2B 45f12cda3a8742ee8a44e0565edf1eb56b2e50c34cf1a5f32485a711863d89c5d72b24df14e5827b40c4a9d572129542d95f8cbdeeea08fa7ea94218303baee8 SHA512 174d0b91da733724f5233e5def4a58139a5e93b831b43e66c3ae1563c43a2da624fbf3e1404cd04c376ac5058964eb6d85cafa88be75ca84ab0e4a05ad97d0e2
-DIST gentoo-kernel-5.4.159-1.x86.xpak 53208509 BLAKE2B dcea0c9257b9544db7afff76c6776fd3e6873dcc0af5893017da56ed4ec5cb885bc43e5bcada3a01d9f3647a89a43aa44b431ec28866ef8152949731099e7c96 SHA512 d69849f4953fb9fda75c34478ee26cd651721bca291108ba0ab39f5f5902b3ab39a94e7ec6af958707103c08609424e0c744407316e480cb9c80017fda397163
 DIST gentoo-kernel-5.4.160-1.amd64.xpak 61419703 BLAKE2B 82b6f04cd1d7c2485b1fad1ab6c7aac432a39f4463d248ea9f1b2d42f57838b64cee7f5867491dc7551c5d7b0dc26c8c4c99029a2c224bfb52f9cfbd817a0a45 SHA512 4ee0ff7ac258517898c06324b6b26102391bc7c0525c4c6a8579e95f458e5ff6aeeb6dca62e19b6323b847461f032c15a6ae1dcee31eb72e681e033512660561
 DIST gentoo-kernel-5.4.160-1.arm64.xpak 57566747 BLAKE2B b95f9665af8b8b29263eca4d0efeb4c4738c565cd5cc82077690182a2f341246037b039ad918f0f33ae770f5b375c486e523c9feb3615069e36e4e59c29311d6 SHA512 041a84459e784973f734ff0aa591f218b80c3e19301a284ea70a7e910d0103848221aa60a7b4d0da5e54d300063edb190ede1caaafeebed2367426db3aa6cc09
 DIST gentoo-kernel-5.4.160-1.x86.xpak 53205051 BLAKE2B 9b67b07cb0b05d8f68d958432a427e7a903ff1a63b14b4d168f6d3ece28775a1042d8f8959e37cc4176123e7c9cafeb925fcb1bad0371af54aa7a4db90ad42a2 SHA512 d9711bcb40751af6c2aaad8888e8169e36f2b35492c867fe572c9901d91d05089fd1f43e6f5d4a39b70e8e540a5877cebf1edd834b4f952484f8fbd4b9cdd103
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.68-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.68-r1.ebuild
deleted file mode 100644
index 875b2aae6ddb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.68-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.68.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.68.ebuild
deleted file mode 100644
index 9d695f0ab5cb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.68.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75-r1.ebuild
deleted file mode 100644
index 875b2aae6ddb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75.ebuild
deleted file mode 100644
index 91004870ff44..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.76-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.76-r1.ebuild
deleted file mode 100644
index 9f8ae493e215..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.76-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.76.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.76.ebuild
deleted file mode 100644
index b23f3e054425..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.76.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.77-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.77-r2.ebuild
deleted file mode 100644
index a76ca745a641..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.77-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.77.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.77.ebuild
deleted file mode 100644
index ee3f48106146..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.77.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.78.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.78.ebuild
index 20a4290d75c4..431a00f8e4b3 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.78.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.78.ebuild
@@ -26,7 +26,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}"
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.79-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.79-r1.ebuild
deleted file mode 100644
index a76ca745a641..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.79-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.79.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.79.ebuild
deleted file mode 100644
index ee3f48106146..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.79.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14-r1.ebuild
deleted file mode 100644
index acaaf28e30cb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.15-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.15-r1.ebuild
deleted file mode 100644
index acaaf28e30cb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.15-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.15.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.15.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.15.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.16-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.16-r1.ebuild
deleted file mode 100644
index acaaf28e30cb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.16-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.16.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.16.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.17-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.17-r1.ebuild
deleted file mode 100644
index 68f84f5bdd4c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.17-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.17.ebuild
deleted file mode 100644
index e00d3ebb8dc1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.17.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.18-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.18-r1.ebuild
deleted file mode 100644
index 68f84f5bdd4c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.18-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.18.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.18.ebuild
deleted file mode 100644
index e00d3ebb8dc1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.18.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.19.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.19.ebuild
deleted file mode 100644
index e00d3ebb8dc1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.19.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.1.ebuild
deleted file mode 100644
index e00d3ebb8dc1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.2.ebuild
deleted file mode 100644
index e00d3ebb8dc1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148-r1.ebuild
deleted file mode 100644
index 2989efafb46c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64-r1.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148.ebuild
deleted file mode 100644
index ce8b125f8437..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155-r1.ebuild
deleted file mode 100644
index 20c793bf1498..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155.ebuild
deleted file mode 100644
index a3d1a4aced1c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.156-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.156-r1.ebuild
deleted file mode 100644
index fe6e6023d323..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.156-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.156.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.156.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.156.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.157-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.157-r1.ebuild
deleted file mode 100644
index fe6e6023d323..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.157-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.157.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.157.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.157.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.158.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.158.ebuild
index a3d1a4aced1c..ce8b125f8437 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.158.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.158.ebuild
@@ -26,7 +26,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}"
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.159-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.159-r1.ebuild
deleted file mode 100644
index fe6e6023d323..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.159-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.159.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.159.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.159.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index ae9766c336e7..cde382793f87 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,51 +1,15 @@
-DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b374477e16c9eb0da2d6f2118f259034fe2d02b3941cb0a36780bb0e123f60b2b62bff89dd058aec5aa050f7ab407361aaa68b SHA512 3b5584878622d899256a554687822279f13944346c3be25b2836c480b2b19c9a875f93400bf34896855f29c28b31aa8b624c1802b99db7ef3469f3508f3476c4
-DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
-DIST genpatches-5.10-81.base.tar.xz 2412768 BLAKE2B fe3b30c2ebbf250eb62c5add14310326a72f01705c010b202768f37a29e6acff39bec319d0629450c0efd3dc69e414a0b6e541d95283f619e5efb425655d8329 SHA512 544e4af48bc55de74ea145a3d01392ce8742faa88580946c16530575512d8f0b7a6e152755c7bd96548080dfc5758a5a33d6b826e97f75a783e50f361f1852d5
-DIST genpatches-5.10-81.extras.tar.xz 3844 BLAKE2B 9774afc1d893bfa0439cebb0d006cf1c0682571668e09adbf97df38c159f016176b8db538562e896a3ef0380e7ab830503d952d8448b2bd02adb22e84cfa0bea SHA512 c450131db06e63521ec0455a76bd4005f62527e92c0971b63e7076f4fdbae41aa6f4648dd5888bcebaffd41c3c5aff99d99efc0531988fdb54cc9bd3af1bcf96
-DIST genpatches-5.10-82.base.tar.xz 2436944 BLAKE2B 1ec08fa67b8d075aad46baee204f9965cba2a219c3c237f7310be5c23ec036f2a386488199ed09eb348a4f0575cd48fd3e14b90316e12a00228589f7e339fc20 SHA512 8b06790d5ab0dff514c0c03c9789537ee9ff75deff4a89e725df78a023bc29501c6c4d8bb9acfc4179bc530b021fdeddea62499d9c43cce842a49bc3b445f863
-DIST genpatches-5.10-82.extras.tar.xz 3840 BLAKE2B 013a2c13750a9d235477f5af6f42fb80703590db72ff254d1fec54957dc7a8eea7e1b2ab430c7a375699edb95c1776dd454b42add5d2ed78a65ea90aad58c831 SHA512 6d4eab6d4dfbfaabb1a117b2844b1fc110b4c7ea3178acb114c3ab862765f46d2fff32cacc3cffc50429f926cadfd479abf56332cd3630f734852e66139f5411
-DIST genpatches-5.10-84.base.tar.xz 2456624 BLAKE2B 601a384268e27c058a4e7ac17f7d1c29463069b8f1ba37669015170c420605f91b5d9780c308dc5969acf6a619fde60876a7f0f6507906849ab4f2f0916aec7c SHA512 e6fe9a033bb3ec6fc3274b033d8a68fec7dcb1acceec654659a06785f87eadcf8102f1ad2eed00919ffc16b73abd156c845a675d036d9e11b5a7c264766356fe
-DIST genpatches-5.10-84.extras.tar.xz 3840 BLAKE2B 77bba1e9fad26e7525b6d3ccb27b2aa0a17c08d21e5a05483895b17babd11a17d280a9c32375cd1b8c2ab8b3875dab7b519ac490c1e189d5df05b7b19c3c74a9 SHA512 1c99561593dc8097d7626efe9eaba1712353bc3ac72780edc515833591b02f90034f039e904f2057b7ab56d142c7716aecb56edf0cb656d474246a6ed0438efb
 DIST genpatches-5.10-85.base.tar.xz 2458980 BLAKE2B 56a0fe583f9db1bd5d1a051c584d1eedd1ac5fe756aea67b51aaaea798ab10669ed2213f0141e1cfb9ef47b7200e35f266c755dcc164121f5d8e7578a31b7935 SHA512 c213cecaa7f30b2beb000073520e3b2dbdc3f106c01cdf166a77af6d795b9ff77f1a05e0fcb0d3d0855fd46d54a1ca0f2d90d8f6dcd4c763050ab34462199c59
 DIST genpatches-5.10-85.extras.tar.xz 3840 BLAKE2B 42ce8a5ec14ebdb8067853fc388b30e178e705e53d6ca547e21ab76bf94ddad1368000226ab455116758cb6ce01e8a8624332dd217b2d49d6ab3393d6f740966 SHA512 10bb7747d4d23203c39cc0f15abc70e5dbe8f3e390b2c95338982225634b3008e415c372b81029b85e0f6619112c65327e6acac5de0fa3cdf58bd8ac30607803
-DIST genpatches-5.10-86.base.tar.xz 2463088 BLAKE2B 34f37eca7a8880c76aac81efb164d5da205cbf9d958a1c678ea570349ef156d71ee49a6557f3c8a4229b7bc2dd22424bb0cf0f2e9b7eb404025640add9c1313b SHA512 133f1704d806f929cc8c4a800fcece05985c55f701bba05061f6413d545e40ceecad5f54cafb20d677e176339cbfc95f36e9ebbcb8177349de5f0666ccbebb77
-DIST genpatches-5.10-86.extras.tar.xz 3844 BLAKE2B 608aba1a5b2bedd005b48aa58d066cfcfe7f4219e89ee35f16ba25da443b9d224aab29986623bd640565b90aba1f5bd347a278d55f2e8a23c876fcebbff4444b SHA512 848711bf665668e7023ad26327b2a15863eade161330885fab8b8d1cb3b0d59568c3bc7a780f172178d526de704987bea50fe319a12a68df60c11761250f3339
 DIST genpatches-5.10-87.base.tar.xz 2594680 BLAKE2B ee5823f80add6faad8cfea1c36e3597ecc0292c5f98b64844fab7c76605fb369e07f4ae48b2e39d3d17879f0befe37cd58a45734c47c73c7572522afb01cc6ad SHA512 15b8d5e3e8403c4c9139fad59382e37a5e211ecec363c43ca385b529fc292a0439c9f93e7b525949bf1519c553111acc96107d0195e11cdad77b03d905bbfdd5
 DIST genpatches-5.10-87.extras.tar.xz 3844 BLAKE2B 7d06efb6943f262cd37cb9c93ed4b0477943fc267499a80fcf1a419641286c072fb8cc7bdb061593be0861e437bc347e9cb4443257fa40887c0875780c76e80e SHA512 c3331486191e9e7e51dd4bde83c2f9a3c76f7753f0e2ff3b1c0dd661e8eb73d39653efdce7e084aadffb55e840de84fe2f9a4878101334bdf0d52e2389e67156
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
-DIST genpatches-5.14-15.base.tar.xz 544344 BLAKE2B 5315b7c850517e559fda958cb73d9bccd97945fd23833f901f81f21ec0b6a114ecbcdc6188b7283f3daf2c2dbb77b470fe4dbd15e6197dbecf1c026aba0f09b5 SHA512 963eb0f6ee49360b041e748bf096ccb4e92a075de029fa65884553f3372c34181f3cd1b1d10c55893df0efda0d4e265cc410ee2d5bfbb6a4dac0be98dc86a638
-DIST genpatches-5.14-15.extras.tar.xz 3840 BLAKE2B 824c2a15749f6e83b03669df117a0838ef955430c4781f5b1423d6a5eb4d3b594c99bda3220ceff3875b00601bf2564eb211ee470a04a7e221f5300d0552adf0 SHA512 197bbcb69a9e79f7938342a7ec2d8b6baa55b48f121ff5bef6d8a3969e41a646fa357cf394e9fb3e8ac6c43338749e8be8b50319020564eff5c30b49786978f1
-DIST genpatches-5.14-16.base.tar.xz 591456 BLAKE2B 5c2faa9bbbc7c35b2c81d2cc3f11e61f3e69964187abfc70301c33fa58bd4762beceab0c298c0b16468def49482d4a0b32c93add83f94bde6e930284f7fc2922 SHA512 860f2cea8a95cfdc0e1524baa5baf168dcd06309a44319503ca0768b611118cc9a654eafc6ac22c2fe5d1a33954a27e7c53a55480e64310442a9a8e279f3e2ba
-DIST genpatches-5.14-16.extras.tar.xz 3840 BLAKE2B c36321060c45651af5fe20fd7bffb8cc2c2cede11a9880997381acd9ab74a2ce99b89632c1061aa1542a6451a87ec4d7ad2536725bf429c243418e6c551d342c SHA512 bf77ba8560347ffd328b97e234d07bd1a8a22378e0209807b21b9cd78d458d4c3bb7a721583d5fffe919ff72fd3c74936dc5a97c911de1ffb35e8db696ff0b5b
-DIST genpatches-5.14-17.base.tar.xz 622212 BLAKE2B a0c5bcabe08e292287b57cdbdd573c8b61cedfc0560a63958ccafe2c1cd671b057b3faf6c4a577e9063b6eae46a1c6d7fb7e25ee92406e4a597ec0e74bb241d3 SHA512 3042091a962cd540b504570ab5ec11b3dda25b84c03529e78a01db232b4a0a716b9ee7b60352b7ad5afca7534af6ccdf14bcad9140ebd78ed56f292e47bf103f
-DIST genpatches-5.14-17.extras.tar.xz 3844 BLAKE2B f50d2d3e47b0e0387c68eff502be6163a167436f6e99a59a56420c1f4215cee35a892b95bcfb2b2f73261db57b52675f080e90a3f69512ba00163bef95cd8e94 SHA512 eaed5b496a124c94093d85cc23d73b345b9bc6b946656fa9e8f3d7eeff719303841f199d9d1312b4d8b69e7f55883a3c8961d3cd568c5ac48390850511c936ad
-DIST genpatches-5.14-19.base.tar.xz 626596 BLAKE2B 8edc9633b2344dd484c39e12ca58b7eece9e442ea6440f7db647c9bcb11ffd72d8eca9d770fd70b82ae61bd38f58613b78be84aaefc18d3edfca7a965654aa3e SHA512 7a6b1bbc2d6badd509b1c0c1106a13eea7b76e2d11e52fd8a805d811b1014a68b6a2dafc95c128c20dfb64ac0db2b71f5b404e7392917e997c585ce5af2234f6
-DIST genpatches-5.14-19.extras.tar.xz 3844 BLAKE2B 178ac464389a96c166e30e5fd16c33754722c74d7cb63f458719fdcfaa582c21d18c983cdb96747d331c1f1911ea8de16cf812efde0075eb02164201bc077be7 SHA512 132393c3e483a1142e240941439137632ed153e14b9320dcb8cbd41115781ee2874954d87463ae0c6154029f078d4b40e1ab63d52ae2f48a733f86cfce677e13
-DIST genpatches-5.14-20.base.tar.xz 634440 BLAKE2B 44ad4acf9c899d22a6f02c722ae18a21796adca21e62208fa5f70e3b131a5e3cf92ae2343e0ed7b86f6dce99bd52521acb619f6b6c603b7913c438be13f06547 SHA512 03557b7ed31a079d1e8a5cd5a917c517e68c88337d5fa61cb528bd39837cb6cdeb74f9e9648ac3a41f9ade4edb5276c94d9b56fc72131814d5fe3daf3c72f03e
-DIST genpatches-5.14-20.extras.tar.xz 3844 BLAKE2B 26b9e372ce744f8a6af8858edbdfc23be85123ba6de3d273d11ce67be3ba2bad1c4c7611039bfb41796bf49de14bd5c2769cbf49bee4cdc0bf5148d34261cd47 SHA512 c51a656e02e5438d61eddfae64c7b62277e30c9d1f8e1d563f812d484c931c37de5a04c4ed23afabde7c39e3e2844aeb25923e7cefc1a948a6617bd9c72277d3
-DIST genpatches-5.14-21.base.tar.xz 862764 BLAKE2B 9ac9818d497117fd980cf21959aaa16eba144b7b48d5f5a5f0ad33062b83a6f1a6f15174a2eff71959e31cde4bc68980bc47378b30e6b1b72b2503e4cd7b62d8 SHA512 483f4a6753d56197ab16f7ff4c793d5cc6413d87e04d848ae48c856fcb05adc1499ea0a4358806198841318497f99b49adfde991df6436b646a0106db28ba4bb
-DIST genpatches-5.14-21.extras.tar.xz 3840 BLAKE2B 32c192fb758d1f9c232bddfc125f2fbaf1ae268c204f1fb1c6ca5651e90b95f9a7cfecc746d7a6a54d02ff7ffd7da3b077d60f9830371c391ac5b8d4b415dfb8 SHA512 3c749cd0c4a19a3c7c26eb7e56a444e56170c5de2205085857fe9df23bdd624220a2fb531b5ce8c58b9636fa3430c6036ab860edd3c34c5ff15329abf042e2b0
 DIST genpatches-5.14-22.base.tar.xz 864000 BLAKE2B 0a2ef4aa3504d23bc2ad1047d76d705ef4fb15e15ccfc59f343bb1f817ba98940d9bcf7151cac74cb02db4e946344e43679ecfd848aca65951764ede5288ad59 SHA512 b597484d880cdcb1e8e7450c48cb5ca6a5902109182ac01725be00c264450e7e0d24e54940d3d55084383725398ee05159dc71ce7c152850a57aabbe5c26b1c7
 DIST genpatches-5.14-22.extras.tar.xz 3844 BLAKE2B d8934cf97acf49434a817afbe3260da98f3bf52c3bb93d09e510d5c90b592af25da702cb1d6cb2c4ca463428bb35b7aba248f13ae48c094544460650c0d7da6f SHA512 d33c4adac4ebdc6a122ec60b37b8e8e1b3f8b47bc6808707c4fba9d2c8d89ded193bfe0cb0929c23fd0fc82ea1cf3d11fa739555606e6313712265e84a7cf033
-DIST genpatches-5.15-3.base.tar.xz 9472 BLAKE2B 209b41dbff1afc55ce8a56332805019848e52d736b90806cafdf966d73f278f301ec466078b6b17c3d558e976c8ccf950bc802e365b06e412bf4f08434b7a9e8 SHA512 fc489ceea8f768cdfca365fb821e7234e7e3a9e650170e81e182b96754494f840971acd29c0902cd1ff3d192dc059755212d0618118b63cd1b62a822182bddf5
-DIST genpatches-5.15-3.extras.tar.xz 3840 BLAKE2B 9fb781e2ac7afd8c56ec3af5d4dc8ba8c1577716b429b04d81cf070debd3f8762933a8388e836007ce4fff0a10be76f97e9707b6f2893f1767e105169b0a3c41 SHA512 93191bce6b2c6d029b1a703b9edc77f8f9567b791a425ad9e4be108747f398083fa9adf0a4dcc92b5b140f60fdf74ed59260ca7bd630837a88bd4645812dc94b
-DIST genpatches-5.15-4.base.tar.xz 20904 BLAKE2B 01add5a35e7eb969a41239254c8a5f3a70f7ff2775e2c3b8e6c3fccf756795a11c5645c0382c03f8225a36231671570cb984382355844c080c7607dc4a5901cf SHA512 6482bbe1af3c60b065541f6cfe1eb44e4aa3ef375533397c58372ef68fd418dd1eac21d2505d78950953c833a28fe2a03105b6ee5f7128e4685d7f4f568a596b
-DIST genpatches-5.15-4.extras.tar.xz 3844 BLAKE2B 211e9120645bfaf52f6e4f23b16775ea3739bc75795ea95f0795b1289f207116d3c9697a7dda3968c1d63cd1d66d097c94888789c7a5e6fcd837d8fe78aee295 SHA512 846b56ae57977c1184148bb6cbc22da2dd7052e68446b963f149e3bb8bca2f759f1abc71198d10b8561a4cf594bed3e6936836bab17602e1d4174e023e1f2514
 DIST genpatches-5.15-5.base.tar.xz 294364 BLAKE2B 59f372c304cff219647a6bf84965e13ea13b0062be222109d3baffb2e243a93905b85fa336a1592fdb2bc48ddb29a34df9d139521a258d56c363e5021f34689c SHA512 4fc8490701f55113f51314805114d3c225525b2464addc29642d337f6cfc5797bfcb0052a7f7b4045bc8b2e48fa673f5334f1c10fdd3df0bf7bcfa4bd022e36a
 DIST genpatches-5.15-5.extras.tar.xz 3844 BLAKE2B 95d55709e177684475f4b580be19811636591f6aace5eed83e61ee2939325596b3e1896d9e573e4c85cbc991f846ed8a916c09aacb1aafdee7dc011f08034729 SHA512 ce42eba5f5fabc2ab20124b2486ed458ea503af43e18f31c2a9a87f8a3872354dcd589bad2ac3fea8bf6c11026b6c9165c8de9c5c71e7a03ba719cec5ab6ed60
-DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432 SHA512 bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
-DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
-DIST genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0 SHA512 31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c
-DIST genpatches-5.4-159.extras.tar.xz 1788 BLAKE2B b3bdde65db00da9eaa5e9d3e1a813bca63304608d61af3c4712a5588fe946a9c53974066467af1678cb7e44646dec35ea607133911f1da2e8a4320118cb44431 SHA512 72353c4e7a35c2513bc9d27888050de1446ece8cb9c079ac03ff90cd855070c31001e37f741c42a2b3d2a76890913cae9cd12b19f2250549273b47667b55435f
-DIST genpatches-5.4-160.base.tar.xz 4078816 BLAKE2B 478bc44ce285e02c37b4452fae6948ca61d0ae841328444e91403a517d398c416cd91a232d057c27a2c3994df19626475566e832457310744d20b700a854ab43 SHA512 ab1500a95a8f9295a6f5ebb7f9c0beb24bf1d0f6d67ca03e1135dc6724e74fe33f5025fba96ba2fd1d96078a20e5099ba1c1e0f1be149d01ebcaa991ff5c2dae
-DIST genpatches-5.4-160.extras.tar.xz 1784 BLAKE2B 8184089c122bb794bc18181ed165b2d03b301f336730b3579c92780b8a551d75963051a0c3c2ce8015a8e7102fda224e7a069ddc5fb5ea90d313637879602270 SHA512 f304a0b349c1a2f42297595ef732a6e31a7babfc71031b56e7e81e14b030cbbcefc25b49429381b47bb60676f63a3ca86b24de333a4ca928825fb2fb59109839
-DIST genpatches-5.4-161.base.tar.xz 4088312 BLAKE2B b9c445ae9e163ed0d918f2833db1ff0683144d8214f7bf806a4e99cefdb33ab0c5968f6c70b9f0e15c22234a6f438a97fe566a6b04bb9dfda7d177cad98b1e6c SHA512 8e077b14090bbfc0f9c9fa8b01d3159317819b2c5f4903613d3bb3dc942ec47135a9f381fe30c5046f2fc640e35bd9f1aab8879803eebb46b051ada5d958dd43
-DIST genpatches-5.4-161.extras.tar.xz 1788 BLAKE2B 940f21b0dd0a57c70a42aac772114e16bdfe3a9ca4119c3b2ca24c7023eed73f646250bbb74f308ec33ec03ff7e0b8b73737e50436f4f0ee68344abf93e0bc2c SHA512 97ff320e68c7cc2b0467e0b4be63b5d95509ff784a98de7bca44f60db9baf31ebdb9d45cb122bd75ec87e9b9daea17b4388f552b520d96ead0e4b5975945a065
 DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
-DIST genpatches-5.4-163.base.tar.xz 4096836 BLAKE2B 706872ed4c8c5fc61e1165bb4455f32ba7e425c69ea925355286dc0c9cbe869ae295e02d79d4b2dbfb80f85ec0ca74a3d91c668de434668522a5fa6b26b9fefc SHA512 934058f21db89518828a5988c3161aac4ec38f119640bd2e29ddb8e43466d8fec056b94b81d58b8518b550d264885b723b33313e10afa3d75bf37aad5fed0b45
-DIST genpatches-5.4-163.extras.tar.xz 1784 BLAKE2B 8245663ee14482d5495bde82cc4f0bc3c37a9cd67991694b9c6790a2a9fa8fdd15f055ea8b1e61ff93e3f1ef769b110ad64fa9a64e906b9a3cae64d7ed4e0fff SHA512 af68646411a8e730fc59f11c5d4cf41556bdf98c4afe524e7d2f7e022240403096d6b744e801a02e6fdaba89cca1c1e098ed5fd1ec7971475cd95b21c06db8ea
 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
 DIST genpatches-5.4-164.extras.tar.xz 1788 BLAKE2B a1c49d863d28e352a89a8ef344e2b9fa7d634147190ef2886e1725ffa0a0acac0a8a1a8eca633dae7213e39f6030951c7af7828449b810d32b987ee8645edfea SHA512 841638c80395371d41aa45fc3cf5af0a4225e312495346514e078fe7d5e0d7dfc758e62402816ababb8f0df020206469920ec6b53fc71d3fbb6fe15cd8cb34ce
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
@@ -54,25 +18,21 @@ DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c
 DIST kernel-aarch64-fedora.config.5.14.14 239141 BLAKE2B 694ab65aa00880dbce213645114e5f0b751036db23f4ec17d45d46edff4e597ffd716f52e158f278fe0eb70ee254be6530040dffd613c0e9cc403348736a8940 SHA512 b5f19b136462e162375a0dfc17415280d83a910797c8e383781dcc61610cb2842cf9543ffb208ad4a90a9d32222322ef049ccce9ca6d9c2b6aa7ba2f8cea7a50
-DIST kernel-aarch64-fedora.config.5.14.6 239152 BLAKE2B 0cbdfeef291cf34a761074e6b83adddf4c0c268878a7b11ac384b9c43cf5ffb26d4e5eb80996c43d63d4a143d9d03e4c4351d087819bae69199a1f593bfd1c6d SHA512 3c9348a35aa8b2279414e03e4b13db849ca1dde0d0a8ee76daae01df93a869749dd90d4d64eefcc5bf345f1c4baf212dc0fce6f54666d3faa126cb65c6dde813
 DIST kernel-aarch64-fedora.config.5.15.0 242542 BLAKE2B 9ba501ddc85198bc35e4524aa19ea9cb0e190cc3b93eeb9338d485a5c49a47a4506fe89183c2b8c0a6abf23361309be88900528110e733fd3efcb510c625941d SHA512 f479a332573c5fb0641b2c4062727a7a76b51039458d53e51dc9019b9844fbeb3f3966bcd80092e1d5cfc64e19c33867beecc1affd91fff315b08d8783c787d0
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.13.9 212571 BLAKE2B 27a5b22855d55a06ee52000736fa7b883ce596dd7c4e602cd9af2c8aeb3dd17c21e7a6b6ca083da58400ce8f9879093ed17a11d551bc3c1300a9d6dc5771b319 SHA512 65764268e52be561df5d744dc6cda1b59d9eb98562b97692ec055c0e1dee621bf82a68df23b1b3d3a23bb537ac731f9c913c1f4fd757815bf665ec81520cd6cf
 DIST kernel-i686-fedora.config.5.14.14 219455 BLAKE2B 7e70512be2276e33e6f3ad7f229bc2001fb176b36fe37073c99c9415201de24b4c81af6d3b55ecf47fb194311c654bc0631e7cf3d0f1fbcc605d69ec19a96fcf SHA512 2f49e512a752dd4d691e6b3b1bc5c6021ac484b07d3eca2876f249f423ffef6236ced4cb2572c746335acba1f543690c805b0a7516022572d1f48878948f1cd8
-DIST kernel-i686-fedora.config.5.14.6 219466 BLAKE2B 1c5a12ac56acbc02f289b0f3a76af845e85d9511bb4ae1e8420dbde3afb9a4e963229ea7e223e5abd5d38bf5bc7fb3130fd231c47acb0f23bef2c4f5e12ba686 SHA512 2a4cf8ad0a6b4aaa2468f98aaedc8d789c19c73f3274786aaa70576999594d5d6974efb18a50d2b01b3d88601d0251ca8cbc67bc9710f4d1c9f7073d5638392d
 DIST kernel-i686-fedora.config.5.15.0 222204 BLAKE2B 339fc3846f5585233d5ce568b7a49cc453087c6244361f971d8ea1a064ace69f631f96284e6fc89b41fafb57a8b9ef64df69c199e1423dd6da168715256ef4a5 SHA512 ace20295c458adade57ce3cf78e178432e6df6a690e1041e7ad6b658540d55007d0843abbd3029a3388098bb45655fe5b0ff5795ea6796048ff60183db7113d3
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.13.9 199766 BLAKE2B a382e59e1b75b0cf6154074fd3a449d07c96a32f098405a47bbb34cbdbe145143827ac632ec075b929a77da41d65c6a42867222f5478f9319b3e80d66a3fa2bc SHA512 6cdc5c5bf12ee3614128fc98dc6aefb192ea4bb47b5b687e17257453fbb92b5b9d5259c3b1c5bd706329cfcfc83e2cf0ac69d929d9a2a6e95073cf448bf42572
 DIST kernel-ppc64le-fedora.config.5.14.14 210245 BLAKE2B d9c9ed660d5a525d53c9192cc8e00a484364ac34d8fb6f228e751f6ad35ad8ead111b3c7863fa29f99b6bdde1de64296745a5b39621fad83b2fcee7dcd2a93a0 SHA512 c04582e579025ffce63d1cda81c45fe097d5d0c811324aa86d53a28c398c4eb0175d621846bf26d037ff552378e8dbda4e05afb280d75f45ac83530588eb7630
-DIST kernel-ppc64le-fedora.config.5.14.6 210256 BLAKE2B 02d11487c386c26147258dca832f801061a0249161859a1ae7217eb1adb2e22429bb4a629c7e75d9bb78de229db8f3d9ec666c492317fc49fa0ab3e91be5d4dd SHA512 2347e846754ffd1de829ff0740e67bd249baa3d52b6dc73a98718ed1e68ae56912c4f9323414ae900ab9b7dcde24e252fb36c5edc6be5f52259e8e260a55f54b
 DIST kernel-ppc64le-fedora.config.5.15.0 213222 BLAKE2B ea73dad2749332cd729d43d08538300a3687add1029e16563fb48fca0f46f3c1ed064d4e024fe733de51feb377d7010a862ad6ccebcb53aaf55a9409d23b3b10 SHA512 84431c547dc14a721ef4d2347c92aa6ffd2847b57e09be3227be7bbbe51c38b1b828dd8df5e5e5e44610e92a75623d55f32eb110a428c1d18721b6187a80c6ae
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.13.9 213604 BLAKE2B 9f594a498744e03f8f87bb434d362aeff326b34b1bd4d0a6b0027ec3bd3d15bee554be4883a75d3c19ba2174481f3dfd23bb9d9d713485f6f8474f608515d5e2 SHA512 c11abe0a6a81221bfbd2af0ede4358b464a5bcc72eb46e153ef513b4f7e85e2beb9159234b264e5fccccb8767a89efccc6eb1abcaffcb10f6d3fa5cef6415405
 DIST kernel-x86_64-fedora.config.5.14.14 220477 BLAKE2B 3495230f6de14ee07e6a03d889b8f27dc509ce2a1babe4a5a8bc525e3007325fb6814c7c078146eb7da61778ea179d84b0128fdc7bec55aaa33aacc0ab3b52e4 SHA512 66f9fad1fec43b6aa0e8c4214966290369296eac6780c10a7c1dd50134736529a3dfd5653d0f62b39c6bf56ddb4ca71c353bd8b0924172833f90910074c16df2
-DIST kernel-x86_64-fedora.config.5.14.6 220488 BLAKE2B 15e295e91452c12b7feebc2047e0f116c3f464be81f9f3d866bbcd42c38e522748f70f74e6eac12a9b34b97957f93174ca90187d8c0befcfb1a3e4c63f240c57 SHA512 0a2375c440f3308f46ee4cfc04b328387576193cb5320e608f1f98c038e802fb01cb48a382d05c8cccc91b13f49d55e66bcfe4e625e2ab1d6edc89a9ee61291f
 DIST kernel-x86_64-fedora.config.5.15.0 223235 BLAKE2B 904b162c4ac7dc43fa72802dc452c1a708062472e2276586c8ea9445d1de0358daa6b1b56abe2c31fcb1c4a0993395e9f1da47399f07aa32aca35ddda4dd8d67 SHA512 82733811d56d03a82a9818589a60a957b5db4cf475f6fd4b129d8c1b50e7fb610914d534fe80f6794cb38e30405dc957720c3c81b049a70f359580ed4a6d5eea
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68.ebuild
deleted file mode 100644
index 033e2524ce10..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.68.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75.ebuild
deleted file mode 100644
index ad64051e0e32..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.76.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.76.ebuild
deleted file mode 100644
index fa9024afebc2..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.76.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.77.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.77.ebuild
deleted file mode 100644
index 101b27accc36..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.77.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.78.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.78.ebuild
index 0147283d533b..4ebbe45deea4 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.78.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.78.ebuild
@@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.79.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.79.ebuild
deleted file mode 100644
index 101b27accc36..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.79.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14.ebuild
deleted file mode 100644
index b7a0d9f34177..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.6
-CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15.ebuild
deleted file mode 100644
index e3f5ae1d9d4c..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.15.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16.ebuild
deleted file mode 100644
index e3f5ae1d9d4c..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.17.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.17.ebuild
deleted file mode 100644
index 7bd79c6b5872..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.17.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18.ebuild
deleted file mode 100644
index 7bd79c6b5872..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.18.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.19.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.19.ebuild
deleted file mode 100644
index 5a245d29d9d1..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.19.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.1.ebuild
deleted file mode 100644
index 09500e23556c..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.0
-CONFIG_HASH=ac22a7ccb1707c38a74189c47fc991414cc01bca
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.2.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.2.ebuild
deleted file mode 100644
index 09500e23556c..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.0
-CONFIG_HASH=ac22a7ccb1707c38a74189c47fc991414cc01bca
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.148.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.148.ebuild
deleted file mode 100644
index bfc431677a85..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.148.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155.ebuild
deleted file mode 100644
index fcab7e5b4c42..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.156.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.156.ebuild
deleted file mode 100644
index ef8b4347c4d2..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.156.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.157.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.157.ebuild
deleted file mode 100644
index ef8b4347c4d2..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.157.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158.ebuild
index fcab7e5b4c42..460a19552f54 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158.ebuild
@@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.159.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.159.ebuild
deleted file mode 100644
index ef8b4347c4d2..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.159.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 0a0d4a73e5f7..d3a5ca2275ce 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -4,74 +4,34 @@ DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c
 DIST kernel-aarch64-fedora.config.5.14.14 239141 BLAKE2B 694ab65aa00880dbce213645114e5f0b751036db23f4ec17d45d46edff4e597ffd716f52e158f278fe0eb70ee254be6530040dffd613c0e9cc403348736a8940 SHA512 b5f19b136462e162375a0dfc17415280d83a910797c8e383781dcc61610cb2842cf9543ffb208ad4a90a9d32222322ef049ccce9ca6d9c2b6aa7ba2f8cea7a50
-DIST kernel-aarch64-fedora.config.5.14.6 239152 BLAKE2B 0cbdfeef291cf34a761074e6b83adddf4c0c268878a7b11ac384b9c43cf5ffb26d4e5eb80996c43d63d4a143d9d03e4c4351d087819bae69199a1f593bfd1c6d SHA512 3c9348a35aa8b2279414e03e4b13db849ca1dde0d0a8ee76daae01df93a869749dd90d4d64eefcc5bf345f1c4baf212dc0fce6f54666d3faa126cb65c6dde813
 DIST kernel-aarch64-fedora.config.5.15.0 242542 BLAKE2B 9ba501ddc85198bc35e4524aa19ea9cb0e190cc3b93eeb9338d485a5c49a47a4506fe89183c2b8c0a6abf23361309be88900528110e733fd3efcb510c625941d SHA512 f479a332573c5fb0641b2c4062727a7a76b51039458d53e51dc9019b9844fbeb3f3966bcd80092e1d5cfc64e19c33867beecc1affd91fff315b08d8783c787d0
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.13.9 212571 BLAKE2B 27a5b22855d55a06ee52000736fa7b883ce596dd7c4e602cd9af2c8aeb3dd17c21e7a6b6ca083da58400ce8f9879093ed17a11d551bc3c1300a9d6dc5771b319 SHA512 65764268e52be561df5d744dc6cda1b59d9eb98562b97692ec055c0e1dee621bf82a68df23b1b3d3a23bb537ac731f9c913c1f4fd757815bf665ec81520cd6cf
 DIST kernel-i686-fedora.config.5.14.14 219455 BLAKE2B 7e70512be2276e33e6f3ad7f229bc2001fb176b36fe37073c99c9415201de24b4c81af6d3b55ecf47fb194311c654bc0631e7cf3d0f1fbcc605d69ec19a96fcf SHA512 2f49e512a752dd4d691e6b3b1bc5c6021ac484b07d3eca2876f249f423ffef6236ced4cb2572c746335acba1f543690c805b0a7516022572d1f48878948f1cd8
-DIST kernel-i686-fedora.config.5.14.6 219466 BLAKE2B 1c5a12ac56acbc02f289b0f3a76af845e85d9511bb4ae1e8420dbde3afb9a4e963229ea7e223e5abd5d38bf5bc7fb3130fd231c47acb0f23bef2c4f5e12ba686 SHA512 2a4cf8ad0a6b4aaa2468f98aaedc8d789c19c73f3274786aaa70576999594d5d6974efb18a50d2b01b3d88601d0251ca8cbc67bc9710f4d1c9f7073d5638392d
 DIST kernel-i686-fedora.config.5.15.0 222204 BLAKE2B 339fc3846f5585233d5ce568b7a49cc453087c6244361f971d8ea1a064ace69f631f96284e6fc89b41fafb57a8b9ef64df69c199e1423dd6da168715256ef4a5 SHA512 ace20295c458adade57ce3cf78e178432e6df6a690e1041e7ad6b658540d55007d0843abbd3029a3388098bb45655fe5b0ff5795ea6796048ff60183db7113d3
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.13.9 199766 BLAKE2B a382e59e1b75b0cf6154074fd3a449d07c96a32f098405a47bbb34cbdbe145143827ac632ec075b929a77da41d65c6a42867222f5478f9319b3e80d66a3fa2bc SHA512 6cdc5c5bf12ee3614128fc98dc6aefb192ea4bb47b5b687e17257453fbb92b5b9d5259c3b1c5bd706329cfcfc83e2cf0ac69d929d9a2a6e95073cf448bf42572
 DIST kernel-ppc64le-fedora.config.5.14.14 210245 BLAKE2B d9c9ed660d5a525d53c9192cc8e00a484364ac34d8fb6f228e751f6ad35ad8ead111b3c7863fa29f99b6bdde1de64296745a5b39621fad83b2fcee7dcd2a93a0 SHA512 c04582e579025ffce63d1cda81c45fe097d5d0c811324aa86d53a28c398c4eb0175d621846bf26d037ff552378e8dbda4e05afb280d75f45ac83530588eb7630
-DIST kernel-ppc64le-fedora.config.5.14.6 210256 BLAKE2B 02d11487c386c26147258dca832f801061a0249161859a1ae7217eb1adb2e22429bb4a629c7e75d9bb78de229db8f3d9ec666c492317fc49fa0ab3e91be5d4dd SHA512 2347e846754ffd1de829ff0740e67bd249baa3d52b6dc73a98718ed1e68ae56912c4f9323414ae900ab9b7dcde24e252fb36c5edc6be5f52259e8e260a55f54b
 DIST kernel-ppc64le-fedora.config.5.15.0 213222 BLAKE2B ea73dad2749332cd729d43d08538300a3687add1029e16563fb48fca0f46f3c1ed064d4e024fe733de51feb377d7010a862ad6ccebcb53aaf55a9409d23b3b10 SHA512 84431c547dc14a721ef4d2347c92aa6ffd2847b57e09be3227be7bbbe51c38b1b828dd8df5e5e5e44610e92a75623d55f32eb110a428c1d18721b6187a80c6ae
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.13.9 213604 BLAKE2B 9f594a498744e03f8f87bb434d362aeff326b34b1bd4d0a6b0027ec3bd3d15bee554be4883a75d3c19ba2174481f3dfd23bb9d9d713485f6f8474f608515d5e2 SHA512 c11abe0a6a81221bfbd2af0ede4358b464a5bcc72eb46e153ef513b4f7e85e2beb9159234b264e5fccccb8767a89efccc6eb1abcaffcb10f6d3fa5cef6415405
 DIST kernel-x86_64-fedora.config.5.14.14 220477 BLAKE2B 3495230f6de14ee07e6a03d889b8f27dc509ce2a1babe4a5a8bc525e3007325fb6814c7c078146eb7da61778ea179d84b0128fdc7bec55aaa33aacc0ab3b52e4 SHA512 66f9fad1fec43b6aa0e8c4214966290369296eac6780c10a7c1dd50134736529a3dfd5653d0f62b39c6bf56ddb4ca71c353bd8b0924172833f90910074c16df2
-DIST kernel-x86_64-fedora.config.5.14.6 220488 BLAKE2B 15e295e91452c12b7feebc2047e0f116c3f464be81f9f3d866bbcd42c38e522748f70f74e6eac12a9b34b97957f93174ca90187d8c0befcfb1a3e4c63f240c57 SHA512 0a2375c440f3308f46ee4cfc04b328387576193cb5320e608f1f98c038e802fb01cb48a382d05c8cccc91b13f49d55e66bcfe4e625e2ab1d6edc89a9ee61291f
 DIST kernel-x86_64-fedora.config.5.15.0 223235 BLAKE2B 904b162c4ac7dc43fa72802dc452c1a708062472e2276586c8ea9445d1de0358daa6b1b56abe2c31fcb1c4a0993395e9f1da47399f07aa32aca35ddda4dd8d67 SHA512 82733811d56d03a82a9818589a60a957b5db4cf475f6fd4b129d8c1b50e7fb610914d534fe80f6794cb38e30405dc957720c3c81b049a70f359580ed4a6d5eea
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.68.tar.sign 991 BLAKE2B f418314ac525edb55b161244b27b62808af563606b0f5f06542d72bca558e38dc94f5bf4be32546b3b0db3718fedccb63c9e99579bb4c829029de6a34128c5a9 SHA512 a522887a75776b7ed2b3cdcf0e8337fceaf7a60ec2f9758f805538038c9e6a0a0c8b73b43ae6d31535688c03def2d66e0d612a8f4388a583bb6cf58cbb89ef5e
-DIST linux-5.10.68.tar.xz 116420600 BLAKE2B 826e796cef5be82ab54fbaefa14c104561429ce051cf2455d21da7f0a112d3ef1cd99a9ee287565792d46d4b0fcb880f3c3849779a9b04182cb897e37372b032 SHA512 9430f0b0e66513101ee4905eb8fb3cd14b7f64eb2847bd53704bfd99b1a608ec9c2ccb7de5e8bb2ce8a20d59654f94e38b62ee2212ed53461edd2fad137d2eeb
-DIST linux-5.10.75.tar.sign 991 BLAKE2B 903ef4871f5329bc08910c62b2e0251f0e9527eab0d697e276ff29049e1c1daf377416607c38efdef1b4202636fec9637d63ba4acdc52256f2a5d529e890df3c SHA512 8a229e019a42de32dfc6e228a6f1235f4ad25aeed5e16fd0552188753a8ef83aaf866957bd618c78372f76f6a345795173708f82dceef11978f3eb1616c2f1f9
-DIST linux-5.10.75.tar.xz 116447936 BLAKE2B 7f636f61ad70c6a23859b8ad97c29bb1526f2f69f2d05e9470dea1ae169b8e9bebb86b90e90d89b7897915ec5de871836e528cfeb7f4b46408200b7e6cb9f495 SHA512 93ebdccc6ce0ede721b67d5f13d6efb80eb5444c5a57b509c24df2bb92ca9afd7662735b1e009ad24d6d93531a9e614e8f5ba14e96d5e4f1d041a5be826d1975
-DIST linux-5.10.76.tar.sign 991 BLAKE2B 55ebbfc3819cbdd5e1282ea77126bf0535eeff85073df3e55644177012ac6b0024288c13021e1037d57a9e1c56bf00a335d1d0c5ad9793547d79bea64f73c06e SHA512 14ad6bfc0b37dcc29b8ce1cf187116206ed789b4fdf1059fcc99459f0d5973781ac0e1cf4ab9170927280cf255d9e91c05956d88808fb1b3d7b403f10de2eb0e
-DIST linux-5.10.76.tar.xz 116445144 BLAKE2B 8ee89f5cac2044e6cd9ff3be25cd59450cdab89aaeccdc90cc9dae4a121d719e0cfd71b9c80818a8a2ceb28f47d17f518aab5691ddbba25b65f57fe147543801 SHA512 1c889a003cd776bf8126011a3f7134ea5eab3c16066deb6f650cab5fdedd67a2fb18f4c74401f01ac5aa7f51b3974549a6a74d49dfbd89a4f37175a755148f7c
-DIST linux-5.10.77.tar.sign 991 BLAKE2B 73ac1243cfa850cdbb5c9c65180d6f5a8b5b0934039e6f4127d80084a547fa142ac08d06ca87e2a0f5f12a4f1d810c6d5b7e69082218a93b096b27179a3c427f SHA512 0aa50e489a9646f243e4479801f081c51b3aa6b393b12e13a80b3cbb8444eee00c2b5ed9caff4438e520c8662180b636426d8452c29a80b7a210bad291c274f2
-DIST linux-5.10.77.tar.xz 116442512 BLAKE2B 1da240f450143c44dc5c370681001236dfb8054a0c8b057e61ed58c6f0515e8e18141d21e5229b0ddc84b63f2534eb44174f9d235b4c96688f3199fd7eabb985 SHA512 ad9c4541504c7ce7422b868b6683f2c24bb0ead9a9402459bff7bd468510e067f05da9b561cd8671e510c7c2f294da26fa427ee77c948455a5cca36bdd8edc3b
 DIST linux-5.10.78.tar.sign 991 BLAKE2B 7c0ce0c667457f5933f374512a43e712f9ee9b9e4eacf71d6fe2131d6bbc508fb7f7f2a1046b6df0a7f04f3ac60d16517d9b4e47b95278d4c77d80d59b46c51b SHA512 d8e30e201b46a76ed407d55a4a0af0f2311aa86e415ef888da011341431cad8bbe5417655ba6b6b8340b382117115fa004cceeeda7de99a4bc192962a96e3837
 DIST linux-5.10.78.tar.xz 116448984 BLAKE2B 0c6c3bd590fedd5d42c9d950fa075ba31297099e307c0bd984c63ee076648c75386ae271f388cc4ce5a9206f6e7f0b2d2fd7f8819bde0d6d5574a242a64bbbd8 SHA512 3ec352e6d50480dddfa3fa903c37f72b1b027c541862182e910013c5d461431d4782fb4908c74513d20a4c093abf0318ca9a76bac6c1b56145d0fb21ad194169
-DIST linux-5.10.79.tar.sign 991 BLAKE2B 555d31316c540a694a501cd8c3cb1024e6d10bc9e5af66cd949f38511f6e412f696fa9c995a904ffb01f4d9f71275a3dc140ba9b1fbd7b37baea19a47c4d6bf8 SHA512 a539df6e5bd5b408839d2d5d8b410e2861e6bce6e293c6b916be5d6ce6d8238e514a5046e5a49730cc951368ff08d984d03cf66cbb128ad3792b3c1de9e77741
-DIST linux-5.10.79.tar.xz 116442892 BLAKE2B 9aba74cb8181fab3dacc1a066be01a895141a39d5d20d26a22374e9246ac62e49196dd9637040d17c7b7a43774cd6fd471e2670ba385568c8268c43909f96880 SHA512 5bcfa281138cbb293559c8fe5ebb90cde003230dfc5b231a29df42db4cdd5bd639abe956a9c995daa642c5efc93404406a3bde5d65f5c1667637729e67bea48c
 DIST linux-5.10.80.tar.sign 991 BLAKE2B a7c03fb059c91dc939bf4f646aa864e7ebe7ea299928ef8ddb1b83c271dae0a39d8168df4734ace405c20e8b91d379d3dc45ded5ddfab0fad54296ba17b0da6a SHA512 47b72cd7242e416411e8164260b797099b94e4f13db469f48b0b10e43a547f5ca676b85c9f7ce031c66b03a95099fa3ef0ee5bea4bffce2856cce85aea6b43d0
 DIST linux-5.10.80.tar.xz 116467076 BLAKE2B 7e40b8d8c17b67dda064b3f489b534a1780b0317d1079ed721229a637ed8f56cdf7110971bfa959e1cf96fb2856a293754d6a0c422aa81d760b0e43607c36645 SHA512 f26a6a69677c9c2041e53aa7cd1b4de49522e8a5e5ffe940d91f56019df1e7a5807af701dd09f33066f66e61be0dbb93bcda1b6491f77c493650bb9c011c88db
 DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367 SHA512 a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
-DIST linux-5.14.14.tar.sign 991 BLAKE2B f391ab4207b20e9efe0e7ddd40d0b25ae643dc9242f353ad708c0e30f8ec3cacbe531f4c1754ce4c4205906965d5d6fcef2c0349c4d49a4288b60e83194a60de SHA512 85f7811b8647dfa3ec04cadf64602a791a5c750f213a45c5fbb6f326b263d51b0c1d7e86645e6b6bce5342458281786aa43e58516375fe082ee99289576ac344
-DIST linux-5.14.14.tar.xz 120707532 BLAKE2B c4f29298a98cfd42a4ee6d2cc94da5d213e57e1160918ddbb7796c511541a85eeed53f9e30203dc5c9e941ebb0a516b6b3f0b525f93f7752cb22d30f76432dfd SHA512 bd21aee0d84e213c4ed387a9da825594d2d576690d0b82ad6aaf123a1d8340b9804d4e99f909ba39f927c524409e35d26ed175c50d5236a8f3f66c7f5837e4a1
-DIST linux-5.14.15.tar.sign 991 BLAKE2B d90b6d02ac482a4e1a4420bca5cc515ed00817238a73911405850c10f82d0e365a98185cac365bf94d80b7aaf7fd5932cfe2b66257fa2b191611ee6d35a89a76 SHA512 6bece648b07d33abd7e9d28874f15a1fd91da73a5f80df028dfd929a236d2205ab592e07192f81bfca4238c6f679f8f6995c9a6f53f15e6f1f7b4578cfc4c5de
-DIST linux-5.14.15.tar.xz 120705580 BLAKE2B 68d89bba3c35062e4ba93b4304d238541ced462d839ca4f49641f457f542d27fd11ae4ffe9f5474a5701a26b89858b16c7e667823dddd6945180acc2ef44070d SHA512 f2549b5494ce2e8174b70d29282a60e072ca31d4a83e1e1f4b3f0acb150e1849fe4f2eaf6b6cb18ac758e723c3d53aa8686e4e6d9d7cb9696983ffe64f6a9b59
-DIST linux-5.14.16.tar.sign 991 BLAKE2B cdbe56123fcdffff642dcc284e6dd563ab76f0ce205db671fac8215d4baf0a8fdcbcddd2b3e53607d08f95dd7915b0339a2720038667fb18f884673323689eb5 SHA512 e898cbfac7f4aa8270ba07371afee481ff1ed115886ff08fb8adde34f1235d3a4f053e2f8e8a2a2088cc428e0f4278815e94f0f5719e6f9b69ae0d241ba0e104
-DIST linux-5.14.16.tar.xz 120708740 BLAKE2B e4935cb8e5cf04c100047ac85460c86bbcfd4202269d508c0c120bfc6169577e808e12f1a901b6b583b853df104abf76bb3501592c5b284a46aa0bd6ec24005c SHA512 67eb8755cc67a76ec340a0f8259ea9323f36aeb66c2ab117a66e7f160b3de63737091d3ab696142223338dd45b6c8ce08c1eacbbc6108da3e87fc90f3e135876
-DIST linux-5.14.17.tar.sign 991 BLAKE2B 70aef9a667fdd9c61623731ce1d725cdc39f2fb297bc6d9ce2d380ba66d0bb812c3daa923f44f6edce50fcab7330e43e74beda531245785f4267a271f06d72b4 SHA512 f27767753d9f3db3341aab8215a434f579582d7f424702ba73a7d09b86eb63aa13b21bf7a412f539d243e7fd8e46c853c2fb10010c4567d8f8df9c429be36499
-DIST linux-5.14.17.tar.xz 120712240 BLAKE2B 837649f317a88fd8d086b06f39b2ccefe40055b312c9a9d279ad366db9568979afe5500417f65cb92092f73e6b0ac9117190eb662ac0f6e620243cf1028d80f3 SHA512 7a512c923853a5d8b64fc3584f55dbc0e35188b5159a503e7559db4343d06137fb1fc86e14aa571603ce97050f35b1b32b9ac8e11d667c816c3536f77b2a3e04
-DIST linux-5.14.18.tar.sign 991 BLAKE2B c1111143b50dc9d91525d7a0e280dfd4267b5eae524836ba0e63a3b328dd5ad8302435e54fef0cecce6fa1189abda1fbde16d97fe184129e28d15bf6e83a3691 SHA512 dc359ca2a82cfb16f90fb1f741bccc220a233fb6f471c712e46e929d5e0480ebcf19905d1ce47a667f3f11fcd90d57d860f429d28b3535d16efac1f34a461a7c
-DIST linux-5.14.18.tar.xz 120717464 BLAKE2B 8d9b45a0cc8c8e5b21fd07c07d5df718833bc0e01b199e3975b54bcdeabd27e941ebf594e162ca10c034d4dedbe511c7eaf41d7367a737292abbad0730ecf80d SHA512 c35c6ebda708779748d58f1807ae3e97835c6573699285ff92928899010039753d4ec9e93bfbc804253536da0f9132fa60911a8ebd751857b62ec912661297cb
-DIST linux-5.14.19.tar.sign 991 BLAKE2B 170c5863386153a53827bbd27443584525195915fffbd6659720845c886a2e5868e12e319d870c0870858ab432d8848a737eca2b5f0c1aed70d593e5197168d8 SHA512 37719640003f026236d280aff2e3cb6ab899e3799c8b18a4d9cffb3d172d64b1028a7bda66cb1c52cd6839c3f909a7625d5913a9716929c55e388826956d9f4c
-DIST linux-5.14.19.tar.xz 120705228 BLAKE2B b97e540a279845de2027299d1f4390f35b9efb2a21e1eb30d20f9d35cebfa618f0b56c6c78c614c427eaf8121f515c451a4ce744b4d692ee394b072b2284239f SHA512 5b8f1daf30df41356067a77c244ac2b527a325a37a695bce43699351d24f0daeb37ddb6c4d811f6e73cbb6da35f89488c6ef19b6f153959f0b1a82a929213021
 DIST linux-5.14.20.tar.sign 991 BLAKE2B fa20d7bdb19b223294ee48d85a9ed8077ed81be85a0fa50a50d357d1440f4f832d336d0a1bb97f4cca11c70de206cb142d1c15781adbfb73d16a740e59c34105 SHA512 2ea744e2ef312303fde620a80d70bde1f3f3ae3991e69e78464809456f1d17587c9a745b64c3c8cc5e2cab41962a9674be4a72baa6d0dcc5cae0e0ce18199850
 DIST linux-5.14.20.tar.xz 120729476 BLAKE2B 9572cb635df57e3972a747de0efbad87b64724a609f375ff0f9e6bdb25931795632bd1c770553a6ef22eb9fa0e5dbca9bf862563341ecd471f61f34affec475a SHA512 bbf4166ef6a74948faecfb025761290484c8ad15d88376311dc0a92df7717d900a6d642e206ba0160ecec0e1c360ba1db9fa5dfd375bce580abe9320a41b649e
-DIST linux-5.15.1.tar.sign 989 BLAKE2B 312af6cf75c537117e23146a7f9021d66dfbfd2b2311951f2c676268a68305b255eeb8367963ed6cf1b95a9777b959f7ac334f3a56f95335f4fb0bec40181ca7 SHA512 09a78a12846caeb646cc5c3857e87ce0ab65cf23c0e8ad7299f47b01266edcd86f9fd1bf35e6fb8ead52d039218a68f4de5bc841535e0ddf186fd6a75a5a1534
-DIST linux-5.15.1.tar.xz 121902332 BLAKE2B 4285adfbd99fb853f70db73aed2ba68e146645495d8afc060c5ddae21aa67b3a92c09e76c69809693d4b3b7bfe9dc64efa4c7c43044d19fbd66898459a3f8958 SHA512 bfa8f7a4a742038ebf8f9a5b151554e268545543abca1ea1817fffcf388d6a5f3af3dce1c8279824af3938a9155f5a0d547edad334486d0fe78b7bdf3aef78f0
-DIST linux-5.15.2.tar.sign 989 BLAKE2B 606b013557b8b6ed0305cc0e50a125c69bfe25c46725ac77660d6985d106b395bd6d1bd2388d34f3be27197df64425aa154260b5a13eb0ec7c167fb11bab68ff SHA512 7ede2846cef69a1c3ee08e37bebc0ecfd2d8b3710d7d573bb3ee61320c17e8f9dd6dacda8cb0fc5e458d5d50fe4a7e2b28d1438db39cd2b426d315a14d342885
-DIST linux-5.15.2.tar.xz 121899896 BLAKE2B e1247057fc57e2f071ff150b5e0651db054a1e15a258ebd198921f7ef0c1e441f0a36c46024298175a8a9a0bb7cc0b6d505d7a77a053c1ce88a720ebea424d89 SHA512 3ddeb15d9be260ab757c28ba3c23e9ebbcb23a61dcddaa6c5b54e3556cf720b11e182afa5d3747f981c5cd2777d4642a2854fce0e83441fc9a1948d1c5e5eae8
 DIST linux-5.15.3.tar.sign 989 BLAKE2B 8938a9a4088db857e689c267829e0952d9d95cabed429147a50ef5a12941e72d43196d13ea49c7540927f5231e835cac859c3ea974abb8b9157a9a7a6ee5f568 SHA512 f0219eed88b468ab193deb55116985fdcddcf7898f6cce8ead681b3cffbefa22f78280727d50774e6c3c24e84a9ab31f5666ddd7409ad18f87cb2c7b98a8c77f
 DIST linux-5.15.3.tar.xz 121928320 BLAKE2B 93379b68cfe85a979a7a39179e2bf622702d5e4f7a1d5a5bace1e8d11583d77966bce5b0e61f047fcb40c6c2be401e7725b3aa01e602c6ef4ac045a24ebcc2cd SHA512 3724428553dbba44064e044f960c1dd002427eca79ddc4dd5feb829cdc76394d3bdc99bcf8d67a89cd406dcc6c5f613cc629797bebbf281fdd3ef00aa0724839
-DIST linux-5.4.148.tar.sign 991 BLAKE2B 7e1956bb8e2f801374bd4a7247bf36f1153ddc4edcb417fa311e33b748b3c1448f3a4dcac2825393002232976cf3ad86d3cc0888398bebe5697e5c93b63f59b5 SHA512 abb9491a3315e23ff2939f1d15a2df55eb34561b0340987b9b40e992ce43d7de2cff9b9a729f41b0c030aa0fa783f983823a9100f97c9cfb43402851b6caf13e
-DIST linux-5.4.148.tar.xz 109151568 BLAKE2B 67891fe744cef7a69ea992720256a88e1497a5b687e6f43aee8b3ffde7933e99c10ae5b42d954a6f56435677dcfe53f73f577601adfcf40381ae2209d662e942 SHA512 8793545e4ec419153f8a7c9f4b779cca2d5a2abaab8ccf5d482473282faf71284f6ec08fa195e40d01803d65c079a4f23fe1d95a01f966b7209015635f5e0d23
-DIST linux-5.4.155.tar.sign 991 BLAKE2B 63934a317fc82788f54dbf8ef29873ac44e1654b551757dbff48c1e28353795b13871708ce7ff743738adc80d958edbea8ab0db5dddfc59774985bd661a78338 SHA512 ad4d8b63bb9743a46f17845e7023ba79e0fd4a36ca7ebefb8de3117edb53849cc807fc48e0a315f710817298da731b504818369c18960debab9b888c09134d61
-DIST linux-5.4.155.tar.xz 109180688 BLAKE2B b803f8d0e212bfcc237097a3d699223aad66aa872806e5bb12c6ce7f8965fac5e1006b27948eebe1f2ba7af88a69582e84f6efcd5156c61a0453e1548313511d SHA512 b79b964976ba9f4bd286806782b7e5e04bc0a73f6e23fa637f347cb466f40537901ce61401f1f5450edf4998dadc49ddabd42e8bb4645e0c3b354cd05ec80682
-DIST linux-5.4.156.tar.sign 991 BLAKE2B ea1fc6b0d4185e7b3c8358fee536031e5b3b80bd24b1d9f346e0698fe0931367fd7db1563b4ef67168330fb7320a952d644807c483fd58b60a6ad1f3b939a102 SHA512 dc20852a06bdc0024dab516819b755318d12df2b20527437a19ce120700e36ad991312cc23eb5dcac283904b8038f0bcec959fa0a7b5a3c0b500db5584cea908
-DIST linux-5.4.156.tar.xz 109177304 BLAKE2B 63d5a40f55ff5252cc49efbe5a31069049d1cc5ee3d4d901b996c0378ab01966514852694ad8b4f0a7c38abecec86e14a25b032bb24e7be0a1ac31eb76604db8 SHA512 3a5a9c658a883e68bb314a37078f3f0a4bca8d771bad3cfc72f92759cdca1795c9941ba2d58fc77d193873535796b361959fe9801ef74de63c8e93dc64a2658d
-DIST linux-5.4.157.tar.sign 991 BLAKE2B 9f1fcbc89fb288a5898fb61b6dc23563fb14464b3f794f7e54799263b0d21a3179e5fcdde945f78c59e9dbbea018c3b0a08929956cfbb9602921e6575bdb2158 SHA512 badd54cc13da10de1e6729c8307a0269f2856f10b1ace0f4ab6b7ade5eba6fb8983d33037a3213ff4caf5a2508290832a734ce5e967e2f9210ff151fc33f9ea2
-DIST linux-5.4.157.tar.xz 109178352 BLAKE2B 416f50450cef7d7f2aaeb45cc9be6d88ca63d66e616ffd26bff8b86a5fe7ef30eae007a1e861bbe376cf16b4ff80af7e76df585871eaec4d34d75d32d867edb4 SHA512 05c49649f59dc8c86dff63e430aedbd2e77c93eff7056974a672e2d4c9773454d8451223f9f80649837032913fd2aced8573ff413a424314c00dabfb36770cec
 DIST linux-5.4.158.tar.sign 991 BLAKE2B 533dbce299037f4b4fdb79a8562cad9d05ce4027b15ab0611d7901929051c333555caf4eefd621d28b8daf1101df9f557c47bb06c65701a880f0ab55b5226e0d SHA512 4bd5618db8dbbfe5c8f3810c9afd48b019bdb5ad10fa8e63e5ffd6f25558dae52475ac36444407b5350f7bd88bb307a3fa84abf594aa098a7f4e049d672f49e7
 DIST linux-5.4.158.tar.xz 109178500 BLAKE2B 2f17825064e6dd718b3ed71014c9442fa4970066b496a81b059a8f84d22d1c5522569aa672ce08597a56150eff6315f19e7d0eb56eccdd8d9505f1cd1f6ad901 SHA512 ccbf29c70315055ec7f63eb29262970c68162f2e12046cb45ec17aacf0950e0ed8e60a236744f2fdbd4fe5a0b14e62cdbbb345c32b089e5172feb5e170faa14d
-DIST linux-5.4.159.tar.sign 991 BLAKE2B 6bfa914dbc39f76b76e743277a7f44e486535e831805f51881cc83715188650a63df934ff22a7ec9dcc33daee7f6eb13c748950ffb4b1516b7b28dddf8e1a59c SHA512 ff0e9c4af7d3f9ddc4d2eebd457856fff6c5fe331618239f8d4bab04a56e50f120cbc4ba57b19d0e6115ebd62628a4b568340b166508bb5631af527877becea5
-DIST linux-5.4.159.tar.xz 109178172 BLAKE2B 4b23992b3c90469295440c49657bcac6eb888520ad7e2ec5d1da0eaf0d1105c6ff30ee483dc66c7337750f49969ca1a7dc12349e7641e6363b16291321c4b680 SHA512 52268f2db7dbc141155609fff9ad79d368019e341a67de0cdb993832142231215cf8a827475bdb8cd93aee984d1954feaadaaa9699464d0985d6ad1fc66c421a
 DIST linux-5.4.160.tar.sign 991 BLAKE2B fee86930c4de94769f5c0f4baa4e268412873abf5ac80007aee6452e9a7ba340983b96e7ad5ae91298a245c0ba1541a389fe6070299d6183a05009e38c51dfbf SHA512 5c9b13103e2b7115854d32cfc39b508ef9f0c9fb74a8d83af63b3b514ae280ff6c6e8e576e35bb7ded3d848cf19baf33eafcab7c651002bcd235af5d86118586
 DIST linux-5.4.160.tar.xz 109177312 BLAKE2B 0b42b1e70580ce0a49b2710c8eda28ba5ca397e954c8aa58d81c53fcbc081deb2fb96dd412df026729396a1eaae2bc040fc65dc1bc6e7f5ee9fad2f6294f6e91 SHA512 893f369e898ef0667b7a0897e0268ed254116024fd5cfd1887cd1052547c478c9efe0a928c95d3b07250ea4447a06bd1d57028eef9aa0e8b8c1565e44e20ada3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.68.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.68.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.68.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.75.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.75.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.75.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.76.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.76.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.76.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.77.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.77.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.77.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.79.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.79.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.79.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.14.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.14.ebuild
deleted file mode 100644
index d3a06ae09749..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.14.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.6
-CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.15.ebuild
deleted file mode 100644
index f733bbd2a243..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.15.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.16.ebuild
deleted file mode 100644
index f733bbd2a243..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.16.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.17.ebuild
deleted file mode 100644
index f733bbd2a243..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.17.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.18.ebuild
deleted file mode 100644
index f733bbd2a243..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.18.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.19.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.19.ebuild
deleted file mode 100644
index 1981476fd75b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.19.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.14.14
-CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.1.ebuild
deleted file mode 100644
index 1ebb1bd2ed0e..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.0
-CONFIG_HASH=ac22a7ccb1707c38a74189c47fc991414cc01bca
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.2.ebuild
deleted file mode 100644
index 1ebb1bd2ed0e..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.0
-CONFIG_HASH=ac22a7ccb1707c38a74189c47fc991414cc01bca
-GENTOO_CONFIG_VER=5.13.4
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.148.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.148.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.148.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild
deleted file mode 100644
index 765b04d5024b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.156.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.156.ebuild
deleted file mode 100644
index 765b04d5024b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.156.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.157.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.157.ebuild
deleted file mode 100644
index 765b04d5024b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.157.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.159.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.159.ebuild
deleted file mode 100644
index 765b04d5024b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.159.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a052ab13e579..502d37bfa59a 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
similarity index 97%
rename from sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
rename to sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
index e95748621284..d8f01115f15c 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.25-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 multilib-minimal
+inherit multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
 
 DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
 HOMEPAGE="https://github.com/besser82/libxcrypt"
@@ -97,6 +97,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Avoid possible "illegal instruction" errors with gold
+	# bug #821496
+	tc-ld-disable-gold
+
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
similarity index 97%
rename from sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
rename to sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
index dca937cb958a..5d0f0cffee7d 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.26.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.26-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 # NEED_BOOTSTRAP is for developers to quickly generate a tarball
 # for publishing to the tree.
 NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 multilib-minimal
+inherit multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
 
 DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
 HOMEPAGE="https://github.com/besser82/libxcrypt"
@@ -97,6 +97,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Avoid possible "illegal instruction" errors with gold
+	# bug #821496
+	tc-ld-disable-gold
+
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 5053978da3ef..38d826d3462d 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/dist-kernel-5.10.68.ebuild b/virtual/dist-kernel/dist-kernel-5.10.68.ebuild
deleted file mode 100644
index 340ca7eb117e..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.68.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.75.ebuild b/virtual/dist-kernel/dist-kernel-5.10.75.ebuild
deleted file mode 100644
index ae82fc474526..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.75.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.76.ebuild b/virtual/dist-kernel/dist-kernel-5.10.76.ebuild
deleted file mode 100644
index 00a3441127f5..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.76.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.77.ebuild b/virtual/dist-kernel/dist-kernel-5.10.77.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.77.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.78.ebuild b/virtual/dist-kernel/dist-kernel-5.10.78.ebuild
index ae82fc474526..340ca7eb117e 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.78.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.78.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.10.79.ebuild b/virtual/dist-kernel/dist-kernel-5.10.79.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.79.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.14.ebuild b/virtual/dist-kernel/dist-kernel-5.14.14.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.14.14.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.15.ebuild b/virtual/dist-kernel/dist-kernel-5.14.15.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.14.15.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.16.ebuild b/virtual/dist-kernel/dist-kernel-5.14.16.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.14.16.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.17.ebuild b/virtual/dist-kernel/dist-kernel-5.14.17.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.14.17.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.18.ebuild b/virtual/dist-kernel/dist-kernel-5.14.18.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.14.18.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.19.ebuild b/virtual/dist-kernel/dist-kernel-5.14.19.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.14.19.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.1.ebuild b/virtual/dist-kernel/dist-kernel-5.15.1.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.2.ebuild b/virtual/dist-kernel/dist-kernel-5.15.2.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.148.ebuild b/virtual/dist-kernel/dist-kernel-5.4.148.ebuild
deleted file mode 100644
index 98a5bc7d0b98..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.148.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.155.ebuild b/virtual/dist-kernel/dist-kernel-5.4.155.ebuild
deleted file mode 100644
index 20fb48816096..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.155.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.156.ebuild b/virtual/dist-kernel/dist-kernel-5.4.156.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.156.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.157.ebuild b/virtual/dist-kernel/dist-kernel-5.4.157.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.157.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.158.ebuild b/virtual/dist-kernel/dist-kernel-5.4.158.ebuild
index 20fb48816096..98a5bc7d0b98 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.158.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.158.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.4.159.ebuild b/virtual/dist-kernel/dist-kernel-5.4.159.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.159.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a340954b8a20..16ac9525e966 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 450bef8976d4..8925e129a4c6 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -378,11 +378,108 @@ DIST firefox-94.0.1-vi.xpi 564307 BLAKE2B bf5d0f3fba85514abb76cfbb6f0401da3ee128
 DIST firefox-94.0.1-xh.xpi 420859 BLAKE2B 68842d4622acbf1a23fed065eb73d9ee82922e142b006c71cff39aa36fe0e28a7ae9a637dd0487e3563c751da6ae02df07721797baffc20bc4da6e44d89b5e01 SHA512 3ef6c9dcbe24babb7adcff536536b30788e63504be96263bbffeccb21f56d23a8665c83fdd049636cd44b9fb1c745ff96cbcb9519140fbe3a5cea5e25489a2fc
 DIST firefox-94.0.1-zh-CN.xpi 565916 BLAKE2B 319fc21bdccf3989caffc60018720afda13be5c42bc109a9513b69e2ad5ad7c693fc91f8cc71f946567172969a798fcce9ebadd98732f46f11bf870e32de9431 SHA512 9f1e6321a0add7866bfff43acd1d128976eb46666fe672ec3ad632a556b1e20bf771b9e297becb136bdcb209e3b8f9e0dfcacadabc6c8b2f91c52dae230696e6
 DIST firefox-94.0.1-zh-TW.xpi 566573 BLAKE2B de71dcc798dbb394b9400d5801bda945cd80ded6c68c6e6c4c02bb269d16edfa00c02f21c361ab497071b25a2abf7520a0bca89b370c1bcec9b032c12f08c72f SHA512 8ec5f1fbdfc8d7ce5669f652b2bd7392048559fe8ff9e9f9ab43bc3071ef4272ddeb5c607148ee426e1722fed38cccebe972ba0b7fa6539f09c84ea804610a9c
+DIST firefox-94.0.2-ach.xpi 447241 BLAKE2B 45ab6c5afa8f211801b2e5fea93c0bf0c70cf7a3e5c6b8880472d82cba0fa74250676e71e5602702e4f3cea5958fa5cd571f1f9315dc912c72c4b1fa435d24e0 SHA512 ec020c6d306e1a948924ebf4981f408870a7ddb3c4f234a28b8dc02e0c62f354411817ba3cc482f2c2f11a3a6e4a980453de05b348fbb9ba36c0cd0e09929e33
+DIST firefox-94.0.2-af.xpi 418686 BLAKE2B 688ef4c0cf5ec982549c0983d765409eab54624fe7e9d056c216626dfb0f9614b8c87e3eef58ed2cfd25f18fb481993458611828252b26110e970e550902cf36 SHA512 f5f8e4d0767de05266e7bd708de617a5f0e62e395c4b3b8569504e59407613a47af0c83ff18f568fc70f8e533cc07163c1c9477cbec29b53dbdb98335ae573e3
+DIST firefox-94.0.2-an.xpi 494464 BLAKE2B 26ce20f2c8bf400a19f2fafa501420ce340c027176ed9898760df1d491677e57ce622f953c83256afddf565a858328fcc678240f2c4591b7b16696b66280bb5d SHA512 0e72c470664fb899b7149467dc09baf808ab598e5a196733dbf81015218130b5c6a4736ffb0629030a2f9cebfe6384de8ac370b3fc4da2ab8843bef63060675d
+DIST firefox-94.0.2-ar.xpi 553194 BLAKE2B 8e5399faecbd123455d68012dfcaecc327d0bf0d39fcdd79354fd9e8bd32adac35ad0bb251d12fb3ad47ebc68762e5a06fff4343c3868d5cb7992f4ef5fbd387 SHA512 60b4586507ec55a97b37699d1a8ac0cd83a2dbd902536fb515ac2af48249d2c88b45784a445f33d841778e8ac52c1d63e36c8ed8f9b1030ff8859597687126b0
+DIST firefox-94.0.2-ast.xpi 492807 BLAKE2B 33da379ea64ce2bea60dc90538f68ca744c0892fee90dafcca586a20ac54ce7ce29a2623661f556f2b261329fa05d2a74df5c8c92d3eb35383f26e8c101fb22c SHA512 d3b254251cc2116765344b444c0c8a30d91bae14241a4160bfd7b271ef17cb3413ff0eae5fa59327c800973e8e92b3d52458cc4a1666fc726f75f9b40f183b8e
+DIST firefox-94.0.2-az.xpi 482933 BLAKE2B 3554916b8eaa6286e04d6e9482c9fb6160c02776fd925d2463ad776d6d8906596e3bc8d70fe32464ed053ae7282a6ac992e37c6fcef3132ac130797b6a67c5b3 SHA512 c719aa86485138bdc440fefb2310af32ed8b5a829fb718e137ec3cc670857631f9efcf4ef647d16a9a29b4f11f04ef2c3d919e6d8ee567bfa327b0ce0d0e91e4
+DIST firefox-94.0.2-be.xpi 612140 BLAKE2B d70c5edaec128c881a5a3aec89df266f41ad38edd464726a5db6bcbcc4607d37ca37704cf85aaa4d865f28135b6ce924b0e23ff8a5159b2095d08304132abef3 SHA512 a7db1120e5c0c304df64af6d9b7986eccf200dbd5d6c31c9053c87550668eb6410353c765ffa0eeecac7beb93c578588fe435496b5a43c7a396bf94a690d3b0a
+DIST firefox-94.0.2-bg.xpi 561583 BLAKE2B 944ca406c6325efc03335027510fd33a41411705c3ed926f4ca3179cdaf4a84e71f110f2be7268b331536bdc3d92e15d30ea5024e43c3788d95b0c1e3d7c3c0f SHA512 8ddf87b6c45ee8c31be1df9dac94c5673507a6e2a040dd1dbd412edd4a269b030a49fe7e4768d75078154d30a097b2eac01ed981a4fa4675411a259afde09580
+DIST firefox-94.0.2-bn.xpi 549624 BLAKE2B d3c299b557cdd0afe464e27a6816257811e12f41f446255fd1f2c40631927ab9ef1d765ef9375b3266d27e106853a754298f65b2acc2a0b89dd766a9d66d6cdf SHA512 e6c19ee05eb5fbfa7fb5d755bb22997e1ff645a636424a03166e609ff0947276ca70166c48ac681aba9c7ee3e14aeebb406086f1969eaaa53cf074fa54caafcb
+DIST firefox-94.0.2-br.xpi 518905 BLAKE2B 4cc925352c984328035ee4af4b348edccec50623f4a910ed6d818fb84333b7a8ffc8e97972eb8e33f33e7cb92e4875c45080cad973c8880d857e7b1333a78fda SHA512 102092ecf445616c6331f21c760feff7f2f1fdaddd8881cee06bb4e8eba5d96b784f134fb44ccfd3ac3b19904aa6bf5962254ece0ce03dc9f4ebb24376052664
+DIST firefox-94.0.2-bs.xpi 457706 BLAKE2B e55946902028f0b78e9029e8bf1594502187c6b6193c53afa3e79668280d7a03d506090b108e2799e254a60c3d6732fbb2fa5dadd54c47ecc150bf95f24d055e SHA512 ca59825b983f9a5f9561cf150419240f967c1bafe184adadf12819da3c7e2a1941289ad5625ed222a308a11ba3dca818e9806a386dac7890b51f7cd917a894c3
+DIST firefox-94.0.2-ca-valencia.xpi 523066 BLAKE2B 2decde5c9fe01eb4f7a9d99b0d17569eb29934613b69a1b18e3cad6cb85be1e6b3d0ed1ebdc4bc5a84d9c66376b6af50afdaef84cfd7701ecb4e70e67df9084b SHA512 54c51aca43d74f7ee447dcd091895036ef81c22cbd54afbd22790085b53c8a7b0a238d3eb8849b4c5549d742cc7d3d7278ff40b0f480d2a93bfa85b7373ddd14
+DIST firefox-94.0.2-ca.xpi 523662 BLAKE2B e0ff8d1f14e6181402c63d0987053cf86f141919121b8d17c26eed0a6423cec6dbad57455ecd617ec7a6d8aedfdb0302a0b04fc5fd46d824c0f38d2c888c5f03 SHA512 8ba8850570206a89bccf8fe5a6d49ab6273547db2e62dc9841916fb8fa1c973def60031cf3bcb6890935b2e5fdc7d2bc489ea4d5ec05042a635fffc5325986fc
+DIST firefox-94.0.2-cak.xpi 547147 BLAKE2B 7dbabb3ed8e2b168de9ced2b25a434974eb6f6aabbefb09068d9592c2e951c5aaa17018c45978c3ace458e3943d7e539901dece19a0d4c64fc5a985570b2d1bd SHA512 9be5f51886a00ace70345ac69bb9ea6e58a58aa8c35de176bbd9b21d94c7b1f93702b7f38f92c78761463234b031515238d8820d04401319dbf91141d0c17629
+DIST firefox-94.0.2-cs.xpi 555218 BLAKE2B daf21053d5b2ebe535a9cb83e1a6848add513f66d0fb18ec4a80bce0425907a5f12b020b38ba0bfbd4f88d629de31d19cb6c31f5d5ff463c3100fd7cdd9599ab SHA512 4ca3434e3e4b9869d01070d23fa2a4abfe40c92bf0917c14e7e49a92d02884a7f768e3008d37bdca9c0df6ae9333717f661356415c3501b9456dd2d35a0cacfc
+DIST firefox-94.0.2-cy.xpi 533601 BLAKE2B d7fc74e0f52a114874d2f2cbc308f97773e907c44bcebe05881387cbf75098e0b3a77bbd381d9851e5673baf8d15f0fa0004d6f5b97071fd727f6a51a755454c SHA512 a777f48021b2f0b9ce36c88489999bfae5fc53fcec07d1e609678a84ecb9cc9259043d1c3837a92bcbc2cb27e25cec8b9da32af8e80ce920be7f9e0d455aa1d1
+DIST firefox-94.0.2-da.xpi 525484 BLAKE2B c56dd25b8becef8ca454f0782aae86e708fd8015594c6eff7c509fd8b45c29ef40c3534b9ad561fea53fa4925a63693669a5f200a27e25f72c4c6238f5819d76 SHA512 fed02b6865402a2ad4fddaa6916da5948ed2b0e69e06211ed29f615970c5940676d64c6d78e80ab465f3377aa2b75198197178e83f09ae743e155af22147a4a9
+DIST firefox-94.0.2-de.xpi 544439 BLAKE2B 37c346cff36d08de547073b1754b52fc76fbd9612ac472ea0be2912a9d4b441d448d91002b675ff9569a048fdc9fb5faaaf975f0fdf62157d7f818642a5fed76 SHA512 d51293f16402c73f2e233de57b38250cbbf7deae94ac6ae730586c0599d9c76a1257a3dfa8a54d1e18836647e66ef2a8a540b44b13de4814cbb1d6602655fef0
+DIST firefox-94.0.2-dsb.xpi 556987 BLAKE2B 1a0808ba177c13ac1489cb9ee61276c4d9d60eb41da5652cf061d2364d08b9ac5ff3ae94a0a04fea172d85978f45c0cf53ab996e626afcab32e6a18342fedd9a SHA512 fd9d171db4bc27bb38d7a6909b5fc6ea01ea106fb8ef6918a192fd24782bd97b1c77f81aff9e116cae4e6da8b4ff58cae419401933e97a90484a572c1b0bd339
+DIST firefox-94.0.2-el.xpi 628739 BLAKE2B 3b455a0660c18017cba3f56ad41fcf9ec1c5c9dfcf8458be523afbbe90ed96b40ac7db6160ddafdfe47de15372e7fbfabdb1cb30ab714ee7e03bf1a637d66124 SHA512 504fe04376d5782ca538b63945b4744f744b4929b2b81db8f0838d7f5ac8af811aa3d8c6ef18ae6f4929688472bc2d7e5bad3b71ba4e91d412ca59d4c99ac3ec
+DIST firefox-94.0.2-en-CA.xpi 502078 BLAKE2B 358f757912ba094351319bff00c958320a4423729113eee165f30cb73f16a45e01d79df3b7d70a2ea6f380eb30c144eb7d139958337a959356fc3bf903ed3fe1 SHA512 b509c317e8c890aec87586c1ce90ebed7e14410bcf3266a57ea0a400e95a6487d52d55ede0d03816489ea90df05d9c802a2679b62ab1fc71f212ed00486ee4ec
+DIST firefox-94.0.2-en-GB.xpi 502586 BLAKE2B d9f3f3d497902c8cfe31dcb62e893053ec66e046dcda3dfb97b5712a594329b09d281be5ce6c1377a48aeb9372dbf801da3a02db2eee1973b76ec0a54798d95e SHA512 d2aaa2faf36aa8f61fa9a9d02d7c41170205089c9070b5bf13ac3f930d3e521e4cb8f6eed7a1dca15c0cd722b8bb7e76683d1d772f1bae25ae2a30ba9831e6f5
+DIST firefox-94.0.2-eo.xpi 524537 BLAKE2B 9637e339a8a35f8e4f35e6321e45eeea2d84cb586aa26401a41b3bfa8618eff9be845c2dab6837e59af9a3cba7337f77c66e581cbd3135f6337dc83f90c15f31 SHA512 cb69432c7ca6df7d81e61fa32b8a69d5337d169c9218605be96eba6463145e51b2e4078cbcb37450d59f8630b6139c0812d05a6c4ae27cbd1918f40f42f83ee2
+DIST firefox-94.0.2-es-AR.xpi 538014 BLAKE2B 6b979232a3c21b1dfb04fe9f3bd29ff4ef3466e153357226cf8cf7d5ab82e1888cb3f178a0fa08a02d86a1654f958735c779422c69f4ed44440953205d382b7a SHA512 b1a3a27298396e05f6fe167ca769be5a3fda8253f81e0f395bbe6ba69649a2606d1851642fbe8aa45021912f7f3436630d39ebe21e41b263352001eeb5e99045
+DIST firefox-94.0.2-es-CL.xpi 537549 BLAKE2B 62332c3785d4431a720174a76ba369995e4d9cd72fa66a87669e8b9b57448445633bd54a1b4cea570d165cb1334ff7f50225c1767cb04be2200ffc44f832ef10 SHA512 13a1fb2f8d7f0c29009cca0f83ba474f2d0491a2fbc75c5f9608034493323d04b1910a4fccae7602aece17437c2aea51246df57cdbfa22114810e3a610fefcce
+DIST firefox-94.0.2-es-ES.xpi 528306 BLAKE2B 26f92ee9d9e8cd6a1962fa476cb3999c8bc37ff912ad7ad49a47ec4e758ef6df8f887a28099ae7feecbb1ed4482d5da55100703a23c6a1374e187cb2796c3d5d SHA512 8a968018cced56048dbbea3cb05823ea82e144701e71e537b7e923a2eec3690171fba8a2ecb76d75d4f4316d399205489fed6eb229dfbc0467417a455091e6ba
+DIST firefox-94.0.2-es-MX.xpi 537717 BLAKE2B 4fdd83f784e62451854300b14a24c5a5c48681c98fd158253bda6860bb427495c8256921301f955229e79e044129948ec0279a756b33b01dfe5ca6d708057a61 SHA512 04cfdc6b5b330926111b99ac191be07495dc2aa1d3825be6034e7069029a43b4bfbfc85fe037c3a2f68cd1fa743857adb7170e022050751f7fa7b2c19aea8a50
+DIST firefox-94.0.2-et.xpi 476279 BLAKE2B a7e0d032c7fe9e591ada8031798726b66f674434329604e28be24557ba67c51a9405ab6beb36bc6d7fdb077abb2a530cec0e742efaa4a4b78d7b169cdd2574d2 SHA512 c51912680984fa5f03fc4c1b7b097d3fcba6cca80ea5ae9663dfa19e79a16d5f881c30bd8a68758994e4a46e31835e6b061ebe7bac3d619163fe25e636ea091e
+DIST firefox-94.0.2-eu.xpi 527862 BLAKE2B 5bb985414ef6fbc11fc94410ea8b04232c6b3273da002fa4aecba2a361425e03aa1ce54bb035f1db54f11b1271c7746c5c5832730336199be933584c5744c69f SHA512 1cff76c9782bc3a0fe2bfd909f16bc460d9814b1ad9b1dfda75d7d2ab9054182816e050f24f0ed2eff81b76a0b85f7793da8ea0383728d94db12367b190ed852
+DIST firefox-94.0.2-fa.xpi 549491 BLAKE2B 49cc0d17fd86affe21c48add896075d59b1e89be7da79abe3b5c89b0916e878a22db42305653ae46edf67c462d0350eb4504905bdacc3c61703bd0cbe947c1bd SHA512 de8ca0076795f1f7a2157a40a8830a814c42b4582eec71576e55291faefcbe0cc8109663eb0f5718df29cce216a42875aa592e09b7817863659041bbdcd0cc58
+DIST firefox-94.0.2-ff.xpi 465162 BLAKE2B 48b906dbf341f839e2d85d0957e23ebab7cca06bf24bd59560371aed848e15b8aa4b962e401ed1a70f761a855e3454b61005661bfe7d8b619f3b6bb21db148e1 SHA512 6d461ad28576d2b68bf7e9cb6d07a36476aa8313a99f22ec2f0b2cbaa06a19711b633067d8e455a9a888baff2b3d81d92a5718c806dfaa1435f4cf0be78dba87
+DIST firefox-94.0.2-fi.xpi 521930 BLAKE2B fc7540d31ed78481dbcbe61ba6317bd476a72b4ba5284bddb3ca0258ecfbc3dcfe2d579478eed7487f17cc64b882e13965f607d7e0d2d773412eb76ed68ebc27 SHA512 227d347a11878045a8dc9769a5cc3a42e703f18ce55de5fe83affc1e42d140bf3653d46d8a58b66cc0cbb38d03d04d5ba7addc00baca52cb382bac682234a68c
+DIST firefox-94.0.2-fr.xpi 548695 BLAKE2B c9820a1d717471c79e6a75274549d3b61a11d2629aa9bbec62550ccaad70c03cdaec35ee8989da512f3300a948757deca712932a3407b9c84148a6403c1128ec SHA512 6b216502876f0c4a2249036657f9dd524630f800d6f56e222b9d9ce17dedd4c9fb3957bedc9c5ab9d72d75017fb568a906ba423d70ab828813bea29200d69db9
+DIST firefox-94.0.2-fy-NL.xpi 534445 BLAKE2B 64c91aa7877fa4edee358829601e7ca386704daf0bbac789d91c9c9d6b5e68e5679ed3e4fe43d05359f347545567647f40ab191cb58d8c2e5cfce5a90ac7b847 SHA512 3d74117bd5365c15f67f905846d1f4b497af2b4f00b8c933d81faba7496c08e23c0ebfd3f44e0dff961b3a24e55980f46da2448a9728939ec53a0943621ab745
+DIST firefox-94.0.2-ga-IE.xpi 453332 BLAKE2B efc2dc6616c87151845b3e07605997af96179b6c258b67f0995f5c9ef7a8cb45cb51bc0273b08401334877a5496afd3511f6c50e6fe4194e67494960dee7bd79 SHA512 63f900ebc7bb2e5d37da544807f94379e2b84b059a5570f2296cc08fb490c64ff4f024d1be1159213379f92e33699cb27f35df88834492755a2024afa42c20dd
+DIST firefox-94.0.2-gd.xpi 525506 BLAKE2B 81216eddb619142f928738e2ed078c45de9fb6a826db120f6dd3831dcb2de3412aeb1901d6544d4b1fcfc6e98c658f0c2a4e1e19f1d5817b4cd1b83b23c83f08 SHA512 0b69b62f04192e82b1a78ce36b3402cd20966c7c229fb5c5cc641cc616409374658bad0b64c2c67c738e8085b44c827d44b711f0ae13636167f299bd012c967f
+DIST firefox-94.0.2-gl.xpi 533070 BLAKE2B e70d280bcf7de7797e4d6840ec6e110303cc1b3f17885f29e89322bc8fdfbbe2432cfac5625f791ca31bef8e1f30e1815e0ceacadedabd38ad679bc9c67c3aee SHA512 150f442e6f698e162a4f66bef67246bc20b75f13e9c7876aaca324852f8a356054f4497531b5a4b363933f842d97c31026cc72864ab8f6b0eb94010ae31d3619
+DIST firefox-94.0.2-gn.xpi 549083 BLAKE2B 1206abf3ad515b66e1c7171d21b3aaa959aaa8e6af8b24409741000401bd6d86f9f7db4849bfe5acab25eb1f3e87b9515ccdd6009aebce19f551a558c5b53331 SHA512 67159f16c4c5f613f53403610b4ee9d9157677a48a866bb019b2830ee10376671793afff5da06551c786966f9a2cb16608cbcb66b9b91c209d8e1f2b4afc39de
+DIST firefox-94.0.2-gu-IN.xpi 522304 BLAKE2B 734b01f9316e5a4e404208ff8ae13b36650342c25097eddf17177c35f3c7bd11e50cc6a12ba265d737205d8b036507bdd6786ef0d7afe203ce78988819ce59d8 SHA512 32824093a11e4726c8ca0a80b61737275df096403a3756c12ec60776da73448624800f7725500a684f75af99b3c596dbf2a777261e3ee32c548d29ce6b03e17b
+DIST firefox-94.0.2-he.xpi 548396 BLAKE2B 4cfbc715ecd7a4fd0e2a0972160215e30c40ae46ed9fda258d56d7a99a9d1a83a1d6c8cad77bd258e6a29ed83a502f591e819b09faa558883171d7b012224eac SHA512 aa8df7d8f38add33ca814ad2a2df09837b7820e8eed1f03c5cb3a39f214551522da2f84d0397f61ac5a1454a63acbdc862d11c201c3bf9f23d576d7a7f887dbc
+DIST firefox-94.0.2-hi-IN.xpi 549945 BLAKE2B 857a41445ed57fa127d5d115752f3d88527383104ee49e488f4fa149ca8351da6d7ff81064d1178bb2f8edfab4de5c29990c9d5d1a92ecacd4343759b3eab8de SHA512 f400cf5f672e232775af0d07f324921f29b12a368cdaf80b6d68db7cda343cca69988a66835ee0c45bfe36cdc505d3714bf3ab901b2ce020f7eec7a4602ffccb
+DIST firefox-94.0.2-hr.xpi 524458 BLAKE2B b1b098b59a133b9df1bb66bc6b960aa843da60a621696ac433f01bd8cbca601ca2d8909a707652f5d00fb6695c833d15d04a43f89af7fc0903d2117b52d3de98 SHA512 35d566be8614be5e9264ee618d3128e3a26db7552f88784d08d9a7e9bade25cd16d2c7e0b7f1f37574bc105ff89d0ea4faf215c691906d5d6ede56800d29afea
+DIST firefox-94.0.2-hsb.xpi 553063 BLAKE2B 450366b43ee00152275fdf398703a8882aaaa3a3f5a4cd3c1e2b97e09db24da1daf0d677690d01ede0f339c069d2690cc6bbd8da75cb3489df0b9fe0ebcec969 SHA512 315ab12db114872919e1813d85d638b21e926f75deb7c5ab2ac76f5e77ada90b9ce68bfecb2d5963db52a1507398e9b8c8f3eb0bfc8e9ab85eadffc15719302a
+DIST firefox-94.0.2-hu.xpi 556846 BLAKE2B a4e07ee7cd71f876393d0818b61f74373b5172dd460c628012b1ade50035658ad3a89bc0a446f270f9b101d0c12db81be7b29a6f5b6e7795177878e6ef53c92f SHA512 2fe86f270a290df8adb1f70f8835739fb62f8e25327692d5e35d080db2f03ec94d9c097f9502a4615de84c33a82279085024bbdc70a1ea41c6cf2bb69e090f8d
+DIST firefox-94.0.2-hy-AM.xpi 571835 BLAKE2B 538218d30b5e1bccbac63d343e65753fabd6982f9c95e24d6d62ca8e9d98936b51c132c740be98f5812959ae673a47537ad61e4f728964d68f8d2579797ad1bf SHA512 aa23c25ecf7ba4e6fc490fe78af3a9ed383dcff0e2afeaf3ccaf093da00d2a4c6f04a1c55e62fd94bdeaa144ca804568dc82089b7512677f87a7847825cc6077
+DIST firefox-94.0.2-ia.xpi 523712 BLAKE2B c9d6880548ab5ad240f4b9cfba5f080d2522eb46c1acf55edd0f1123af80609c0d2a3364a89227c13de129eb47ff3302c2125f8d25845c609cc0a9a8b1259fd3 SHA512 192810aefd0a8527f9b6389de53d511b83ed01ca5bb674bbcfc3246a90c1a1d80dd826f528175b8253fdc47f090bdd5c4d5a7d16a28b648e822c1b3dcd068e8e
+DIST firefox-94.0.2-id.xpi 514576 BLAKE2B 4df208eaffd4d1d483b03727cff684cbbe896cbca27cd0b31e39232cd502b0a7c02063400a10133fd0fccd363b48573a5ec4cb763a70cb9e5995a043ac1d4a5d SHA512 8625c881487aba8ebf242f12a28cd127788c7f02bafd8a087c15cd5e30e9bb9c05bcd94fdc27436d7949d9b5fa006804e9588f037f18a47c28702da13a474b16
+DIST firefox-94.0.2-is.xpi 463841 BLAKE2B 7eef44a0d439b434fd6eced9e538d0a4c280fa9aed2bfb126c3479eb8d831469f3233ec2fa6aff5ddd1eeb44213ddedc57b5f53d2b040a6da527d2806da9d722 SHA512 96b67b975d0e67840ac1e4c2bb5465e36af0473819993f0abbb458d5d7261d4ac05cf902670326a70b541f353562259e6309a780765cfe138de6e27feae8e43f
+DIST firefox-94.0.2-it.xpi 452233 BLAKE2B 044962343d5debe74ac7bb5cbeb56090bc14044d0cc471a6e7eb34345adfd8499f4306f426635a96799c16a544dff605e270563464d3defdd25b19211e63cd50 SHA512 1ed85ab4692e1e125815c3af771c6172854bd2c56f2ed2ac85ac4173b18a0d0a884475d0546e8f0fa8bf639c5b8a6218dcd30829e90c9ecf8ebbaebb1ee57d40
+DIST firefox-94.0.2-ja.xpi 578700 BLAKE2B 36932449855551a578a1a9c4bf33170812df4d5663f3256544745493b602eca35ca95be878cdae1a43734c1bb68893602ecabd8c48a5562174b5b8c712776ee1 SHA512 4cbd33c2a53bfbb6517eea5c58bfe1599ebff52db4395398dbecb6bd369925d4bec6e9f1a5cc07199d6b5154df96b29514ee04d9e2da015395380cb13442ac32
+DIST firefox-94.0.2-ka.xpi 577468 BLAKE2B 21258bbb0a60cab7d8c7d330e1a229448138dc103de9828efb6ba47237cf8ada8f48f75df57769dfcb20d64e5d61c77c1651c43a7cfab9a42cd630cf207b007a SHA512 efa08fb14fc31ace656b7a7bf81e6c8cb8ed1900ff927f30655d28243f3c982e1333bfd39ed11171c680c32f14729323b52bb4fd3b0b4c139fa18ebd32fa7613
+DIST firefox-94.0.2-kab.xpi 538086 BLAKE2B 186f84bb7e6167b87c0e9db92830384536d25d9d27fcaa5636fb963a4b047bff7192f7344c6bce67f6efe7c0e93f49eb3b651fc45c3d058e673d5393683bc25e SHA512 b0862bb0521fdc6ae2f01fefcad830dc544fcabdb0ae8601c5ba6bcceff466babe69fa2e79b5e459fa21ca3bd5ecc2bcff5369dfb7f83f597c787f96be876d0c
+DIST firefox-94.0.2-kk.xpi 597580 BLAKE2B 00db302742d9ed714b072b5ef06fb665fd253e753fad7f0191af1ecb1fe42430ac5feba2f471c5dcd89e4d1e2c4cb45c4e4a18e9ac1c2355221faa338af45f84 SHA512 2ce2467e43e62f1a312bed7f09dc561a5f23b76171915f47d964e470f914f391b15fb93948e0450849fe83f3497fc0544dd80364249bbec71e99ce7865a8989c
+DIST firefox-94.0.2-km.xpi 525523 BLAKE2B 983f37f782593dad90246954c7c9bf705611b98091e7c200503aab575afb9cc819651d25ccc3355faed0f2baa3cdfe01387de6ba9a38dd0eab3e9b9c613a799f SHA512 3de801e2dae88e9c9d7a0feba5197333d2f8ef664100597744eddaef7d62ce975d975fecc27a763140643eef1ae5059eb4ae3d6b440a7e43d697ae220f85506c
+DIST firefox-94.0.2-kn.xpi 490615 BLAKE2B 8f7bb52298e9ceec108e90de61c9eb2e8fe1f55b78e16f8a6d26226651802d0d1baf203c371a2527732ebbea9336dab1f7b9494205fa82f9f7bb6ea08ab53bf4 SHA512 bca36cb7bcfc64b08e8e8230a948aef698a523eb3613bd38ca9e9f4917ead6ad15709994e5015015712208403e03b6469f89bbf02b9f382fd121d2a933596ad2
+DIST firefox-94.0.2-ko.xpi 569651 BLAKE2B 87c2b70d08cd9d92aa3ae4b2f3904193fd7812f79be219f6615b7bfef282dc8bfaee89adb2d5e21a99e5afcd2a7ae4ced3826d7c94758ff5e809be1b854efb9e SHA512 ac1a43e5af677e95506122105ecbc38fd5c583e576a764f37b1db91e5100298d377e997fcbd71c502cd49aa62c0563934f7d1b9d07601f99a6cfd98d8f7b0b11
+DIST firefox-94.0.2-lij.xpi 464138 BLAKE2B b1568ba6af9e5635251bea307c0b2f28e7fdf48f89996e2d3e21d796e7cacecb6dcc018e77293afa9d1966774278ae1529005daf99288f6ccd4536cfba311b7a SHA512 722a9f800d955a9f38dbf876d219b2f0b83c90511502be723ae28cc1a4884a49786c7b2c0c672ee6b271b76e796bae4d6b2c12b5d8e0334be2cabd037279200c
+DIST firefox-94.0.2-lt.xpi 551591 BLAKE2B d035ec450f3c04e3aa7c74eb66c014c6fd1474912526a1ec5f259e0967e84406accdf8a2282530bd1fbc26895be6fb692b9bd6f2149154b447f06a44e6557198 SHA512 c08f442ca54213669b641fdb5b9f2379afc5caf8020fc6f78550e2c27fd8ac9e3fc80673fe2f3ac93b175e8aab591ca08bbc9dc53612b59749807a890feaff0d
+DIST firefox-94.0.2-lv.xpi 455940 BLAKE2B e7ffc5012327d99db8db74c51aa63c04b3bfd712b420184a7d70fa4aa10908626e7877d4afd626380730bbf4e5a7fc2730b50cbccccd7bb7c2786cc74b3c83ef SHA512 2aa638651be14b78d2c65945708473cd34996465b6f1800d250f42b7e6f2d43ee13046902327f8620298f6bdfa9814def88faddb75deb3c0e45c93ebc697601d
+DIST firefox-94.0.2-mk.xpi 457960 BLAKE2B e1515eca79db422388ee19f86231761274ad36c42eb0bc89cca1d6746e16c3338dfda02d892d75641605a2b2336372bee7a26477ca6903d01c3999afc13d78d5 SHA512 210c16a4664638c7e381c795361413dfd91a19c36ec59cf07d4edf71d0ce0433d43b2c31e9348d45b220309a0b2d5a4067750cba669a7a8a58f4007b6a83f013
+DIST firefox-94.0.2-mr.xpi 525235 BLAKE2B 526b979165480922b34e8b82a3a760591e86238cd9130d49a51ff56c276994d51dd9e3d347e756eacd255aa85cff5961a76658aec59278e3ddc0764adcb2115b SHA512 b84e19de492c187b4b152f0498248cce68e7cfd63bc9a284659156a24927f7719b2e85ddf1fc3218d7030141093e73c1d082eff6a57385428cff4351e8b5aa2c
+DIST firefox-94.0.2-ms.xpi 441057 BLAKE2B 8ac9392bbc8c504cd04e2a7c138874052de3b2b9343ff5d07b222b5465c45da7a54127a56e092bcea707d10acc04b25b617b6302f43dcf35965bbd17b7ecb46d SHA512 93d0d0ab0cc7d0d26a7cf0b31d9f163ea43b534ecb649b92f5ce6de74c0bd12c157466b8f3246d4e1c09ba5d98f9218366128f58d279e3450a69f5e54639222a
+DIST firefox-94.0.2-my.xpi 509497 BLAKE2B 2d060045a1a9fa7e44989c9c829bdae661d5c9d176ba9d25baf4827ed9935a7887aca420fab12a9976f0a29f8f198b25de7cc248810e9e8f791afb82e1ab56cc SHA512 63883498a51f5678e6d347fae82bf00ee340bb2c1b45869d1dc7ab1f4b61ade479e63cdcbd3d09f9ef332ab253374c77743a3b4d2e5be2f8e9404f20ef260ad9
+DIST firefox-94.0.2-nb-NO.xpi 521046 BLAKE2B 340855390db573b72b196a379614a3cfeab4313b6e60615047714b261c6af3eca2a3403d472deb7a3d6df0081a89f1f1dec8fcad04206fee298874a16dfd7fc6 SHA512 7dfd8390165d2e509e1affbdd25566d20a8e944f6a54fb8a1f48423c33708b85925e48c885a9890ff1855f7aeb82c765e588089c5ffaefe9a9ed17766bdf0a83
+DIST firefox-94.0.2-ne-NP.xpi 468907 BLAKE2B 2a0d563b692a5fbf3dd3a3133380c693a85da0b8c1235521b0ed8fe8dbd6aeb45e57356f3d0f63cbccb9e92f4d942320ae6d9cbc32f7081f42ad51c22444b123 SHA512 ef9f9bf8995d7f6183d97a7f639c4a5abab9c299223f31d6f82ef3f745df51934fcdab352e6b97fbf43b7000e630a3c6f2b30a533d893e84924f8e5fc680020c
+DIST firefox-94.0.2-nl.xpi 528560 BLAKE2B bdd594201a354d73f1caf73198ec4baddb8c9567478c04fbadf1426af2b4744cdef394cef98a43a8bc61d7a203998d753afe4b907f580802081db0227000f14f SHA512 301d4ce7a5ccda8ef5479266782b5948b5c0ab1b37a5f037eb09d6eda4065ab60523cc1f504446c0d5b37ea7c28ba6efa8be3439da8090bccc40a500f1642a31
+DIST firefox-94.0.2-nn-NO.xpi 522400 BLAKE2B ebc3667ab6391f81e93479b4911b06bf79f0ea8ab57ff28e17c7a3c4d549518dd7c292646cc3ed92e60faec34360328f3bc572af32e4d7f43c1288681b2c7240 SHA512 ddaf7a087d023a5e5bd2732f2d47ba022ea141dc48245762ea85374aee5f32234f54be2e95b7d8c9de860320fc4eef9df77bd2b17caf5a74e3e32af0250e6cb2
+DIST firefox-94.0.2-oc.xpi 544144 BLAKE2B bf087b4cacfd9e1baa757450232bf262f72a5834657e10f04dc7352f2d7aa8b43aaf437ce043239677f36242f8eec4ff1f1090f944aab5b5eef20b181aae4fd3 SHA512 5400ed47a38fd5796e36376426f4ffb8b06e9926a3f78b8d36bd2ab549aaea89b441b586453d366d3d403e38f2b408cfce2c35f50585104fc8c2878b1a90bee7
+DIST firefox-94.0.2-pa-IN.xpi 584317 BLAKE2B 5c159d54d4bd428a67970e4a9048f60fef1041e428b61ee44240d4598adb8dc13778839606c5fb650c771cf0df35c4a28e670b2d4d6dcd714cfef6c914ffe121 SHA512 a84a38b34d2a51c108290f422eb43b47d3939d7417070b92b907599e5c7d6dfe1427004c843857047df8cba1ef9cf47faec8e549daded7d0d9a3beefd0938aa8
+DIST firefox-94.0.2-pl.xpi 547911 BLAKE2B 8b9f80bdf28617bb0919e7fbcd2095f64d71f68348309cc55eb61d6a45edbe1c3d78c67591010fa8530928b940dcd7caae9e9c831b4eb6281726fe777ed005e0 SHA512 4d80368133d654733fda11b9f63a27df9a30b2b2e57b9cb67b21be18b6927b420e014913f56f16c64d4ea183f3db9da17ae5caa83ec5641fba65e163aa69a4ef
+DIST firefox-94.0.2-pt-BR.xpi 533801 BLAKE2B df1dd50dd2b55f4fd5cf8daaee03970b82665549aa9e104dc38a9cd74335daa04247ce47c52cd3af4be755a00d3a1a30f4ee85a617347d05d89dc8dff293e087 SHA512 f710bdb17ded7aee9e6da4f1f4a9b363f95c7666b9e79ebf1f405877582bc87f57032d4e0d92b1477d9cc0912f762244de797ebfef04c80d1a0b23c9a91b8819
+DIST firefox-94.0.2-pt-PT.xpi 537467 BLAKE2B 510c74c6f82d9ba2b277ba0b5b11ef783c61fda7fe76bee15e2fda49610f7af34526f3e8b67989e32807f3831d505b3fca7f6c2b93f8c728df4b3d2332c93b27 SHA512 84f59904beddbb13ad02b7520f6b61d4b36e8dec52c62ec905d12cb96b36ad5da3572b0160eb5d2ee3461f9ecd1fc9d924c80692c0d18b08b055c4ac5a80d0bd
+DIST firefox-94.0.2-rm.xpi 528343 BLAKE2B d9bbcdd68e4b8d8b6fd67bb0f2ea2c59bdb0cd4afd167da16cd17e91182067df3fa45e752854e60b7c58a580f0a242b2a87afa37528afc8449d24a7491cb4d9e SHA512 64fc17c5a788e4273a6eb0d09d20a1be71944857e4791dfef7bffee9b8a63d3ff0364ad6f6c23c3357e299db36947fba584f076adf15c387dfd3e612ea9a9c97
+DIST firefox-94.0.2-ro.xpi 523149 BLAKE2B b495a55c7d19016d075eaf867e0415f2d817fc382f9d4f8fa3d75c0fb70a1d6080455b75241a56939453257304396b86d0376d0458cc8c189f519bdb948bc459 SHA512 5662a7ba11cf1d6648550d7d6fa2ab30bff9b0262372356394c2e014cfb442968cbf679b9debdd45939a2a549b99be08bddd80011aa4db9ab914ea7b09824de4
+DIST firefox-94.0.2-ru.xpi 616898 BLAKE2B fe7d409353fc84436b4106c767c00323cbb26cdab9c931e44a5a0ee90605258e3b599aba863eb685e0bde852f46bf10e6dd18b4510817a9cab984a2df075ca96 SHA512 d886a5815b686a95e37a35408af6694dc9566c13731424517e9b78033f1ea8d818b31edb406872e467b09160f430c3c1c42f96a634ff23d05434d26c35adc053
+DIST firefox-94.0.2-si.xpi 480775 BLAKE2B b71e3d687fcdf17e66ebbb743023f68e91aa4d05a097eb20a9dc813c1ebd600886cd48bf125214df5879e988c0a2b004debc25396825b5d3ae3bdc3cbca1c8ac SHA512 adb1c1ea6c103fb130b8ea2bfa47fcc80a90ebb0c55ce024800dfa9c7cd52d12729293188598148590eddc26f4c993721482b0a8e1f80c421f649cfe77138323
+DIST firefox-94.0.2-sk.xpi 557124 BLAKE2B b30d60616a110183caffc134c9c023971cbe7880948af9b622a021f2ec1c6d0936ae0e5b8598420da564917797701fe3a3d853a930c970aa44cf29b1dff6309f SHA512 60b6dc0bfd9c84ca47918b5da5d4d01c3fc3934aea36202a3436efc0bfb432a7ad39b5da582bdb9db79c2db8c437a0213cce5075ce52ace135285d3b4a52036e
+DIST firefox-94.0.2-sl.xpi 526081 BLAKE2B 6b521955468b1ac1bc5eaafe5a82633160f817d742fd339fe5c4a9d57bfc283123b5b38ac6123c5e20e80ab70e07818a5cb3b788a21d1bd7fa46e4e05f7026d8 SHA512 a1906178bf30c1b95c684a9fc6f20fa698f46b71e9ce41b42d442f7a892051821a8782081de25771b33fc97a3003c2ee646e452beef15a30fee9e39819ac983a
+DIST firefox-94.0.2-son.xpi 417660 BLAKE2B a2097cc3c284ad1fd6ed76aa14a1503cfec2d8b788453ee2f749ab789fc5a02e3a0bab14048fc88738092a1a8146563c67d8b1919e49cbf99caf31fbefc5d95e SHA512 1576da7385def23b5bfa5f79ba577ed76075554eee35bac6e2803a63568bce79f5974b16ac5444927cde8fd94254d607255d6857de5eed218d51a170a78b6a5d
+DIST firefox-94.0.2-sq.xpi 541136 BLAKE2B 153c9ecb4e3766cfa8be1677d090f5d80a7158b42c93ace2a5b67b9d1c709f1dc9db21dc6d81d2871ffecaac3662d156d59a91e52786f808693bc4ddba11fb6b SHA512 2313bd6a14a6a97a64716f43c239419bf6d03359fc691dd64be2cbba3f8b93968ba48742657b06cbc792787df74821dde035620c0df5569ea86cd034c5cc2b88
+DIST firefox-94.0.2-sr.xpi 578413 BLAKE2B 0dde7c2c41b6a6d0ed34cfc628600e53df01c055694c313d792fc0faecfbd96e555a26ff2bcb063f60614416571c36124b761065cd131c268e8d03b75df053e4 SHA512 d179f74587705bdada49fcef9296b66df7f3f3cd7366aef77c314401765e65781412f7af006f815fcc0151ff87edb5262023035873e9c471fe4435cb0498af8b
+DIST firefox-94.0.2-sv-SE.xpi 531347 BLAKE2B 9994b72b10495e4fc1156a8855480144ba292c003a44694cdf03b74b9e9bda25ecf9b21dfe35ff204096df40e8d914a3d781f4c3c679e87314c71f057174f517 SHA512 f0123ec3a0504ae87a4ee312e599f98c24de686cbe2742e379b3cd4aba9303e8b7e84f07fa85d345431737e4a38bdc0db6637c15511908ea1d56885f3c858cf3
+DIST firefox-94.0.2-ta.xpi 504998 BLAKE2B a36fced51d868c0c6be302a108a07f6dfbdc6e1384a9465c65f05019fa324748d2ae97e5fbff09127fc3a8f0dbe37d18198fac3a67233a76af603bb036cc2321 SHA512 584784ee4da4407fa868e7348ebd073d70c6695e4c2ce61cf3a2bb15d6997e127ede25f7aed9db6b3134636ce67efbc4248103484a70846451511b0249097a8b
+DIST firefox-94.0.2-te.xpi 543391 BLAKE2B 39011734116e0a010c3e93a3930abacabec508c93571d0a987f8eff2d8449c8f441dfd72d5a47dcbff33fec742980b7808d6ee477e471f63905ad0fd3612bec5 SHA512 dc43b3adc63b5f00e55049de01bafd83a5b0bb653ea78fd243e4abc6177d2d9cef33db442e6e130205adab500578b78e6c21244adeecf3a8ac51643ebcc37eb8
+DIST firefox-94.0.2-th.xpi 593110 BLAKE2B 9c7ff0577261e5cce787bbf12a6bd19462044c0e3417283785adea30ead7c0ac15fb628a6f235e0d327ce51068365ba9a717059d2007b8dce3f3d04456f9574e SHA512 21bc17c9b3e400f60c441c1001a4426b4fa23dc1fa7bf7ccc6bf1c2517263853e29ade67bd74e91aff31d80236209a20013178ff3cf24a8635f588c674ca77d8
+DIST firefox-94.0.2-tl.xpi 509890 BLAKE2B cb035ec0c874830603d12cb7622e0a5cc5d2d400b5f53d68807880bd0f4eaee05417a5b3f9a75e3cfceec7b6185069caf2b8ae03b8fd35fc7e0d82c159e7a0df SHA512 200b5a1fc32677dc919ede7fd287fb0ed225303e77a997d05be28f0266f4fc2c4833537b389bf6d2441bb223d69a78395dfe43d0cf88619867f7cc7bcbfe59ca
+DIST firefox-94.0.2-tr.xpi 543539 BLAKE2B b3b6b6b13954b793917c845dcac0de3a5148c70b0738f46102e9628b7db1b45df2cc81000dcf76e851e1adef26185c8ee5bda9e3fc0d754a489f47c9bdf10276 SHA512 2aa55b25a5940a9950a6dea32204d18871e2d9564eca77c5bda1ad3455dcc79aba9425fa40bb00bf661e632d5ff06c43c5e0529109e8efe436c7f5183809b9a4
+DIST firefox-94.0.2-trs.xpi 484342 BLAKE2B f3e416dcaeffe33c1f711f6944ce535d18853a194e767dffd2861a381dfbd7b74b4142246b65d0c3e59b7fa41080b0e4b6dcae2da65a081e955f3aa77047bff9 SHA512 970138125e8dec4195e6841d75e0ff1d09e11bf45d1599c13986fc31723c40ce8cbf9f245412d2d344dd0fd236506169a1fc42648c8b7a02eba3a00d25230ee0
+DIST firefox-94.0.2-uk.xpi 610393 BLAKE2B a7c985ccc07fcfc1ae1ed2d3cd10a3aee5b7685b72deffcd3d3c4772028aa2bb3ed4497afaddce1c5cc8840cdc3ba51546f94ad5b16fc9d209a20945bb1bd9fd SHA512 e7c9a2d71d405a8eda6d42e5953dd1d3f8ee7eed18183a350ca7f69c1abcfd6c27753e4bb73f8daabab2db96b75c08466de0edf470d1c37c4e21c306b1c1c01f
+DIST firefox-94.0.2-ur.xpi 549894 BLAKE2B cb59be47ed60201051d0b0505b9d2d36a4debfe41b06f91c63a7f398074563074d92c2a036321a79b772861ef8a98e00fee5b9b073f92eb941f8d384cd5cc482 SHA512 47f839cc20daf86f21e279d29e937fcf0b374ee85ce4be7bc848453c32342bd1e089bc27bb9ea0f6abaace25f0e589681c4d657e92f99c45dd4aeaafc64108dc
+DIST firefox-94.0.2-uz.xpi 460712 BLAKE2B 84639e54b1950433806c9f76b09d06c5e40180093905639d43fdbacaa6bd93c9994564304392732bfe7b29b2f5497453b1dc80f9079532f6337430833c2de29b SHA512 9239047d441655b1e0884da8a16d5aea415ffe2600e7ece7661850c61328439f04f738431e52a7f853842b7808eaeabb63033cdaca2997e1d34c9bcd52b2ee2b
+DIST firefox-94.0.2-vi.xpi 564620 BLAKE2B 19dd083641d232cb399e4f8024fe1e5a01a0bbbaed6ce10a87c71d3d9af553effde221235fbf9d4fc6ddfdbb2e3fe7547d24d651f1a736ad4339558604610284 SHA512 df2511ca3e0a562f5d9a7ad29df08e47372aaf63f7bf11d850e8c5eff18f9534fc112007b1da71e0493262404c3865ed1bf40d004ed78d9e001bd5cb5a4cc210
+DIST firefox-94.0.2-xh.xpi 421170 BLAKE2B 76ad46bddd3283e395aa06b740d65a8b8c2ab70d424e9ea39a4ada42006f2a3234d92fa6092a720261ea391a5a595d01d3e0122fc209d8431d434706eae90658 SHA512 e286288b09c60f6d0f2ec166cd64149441891ae8332e15f22d571b78d2b92f7d01aeb06de93f5072f8198151378298636216114ae23948bb0fb9d560d4eba73a
+DIST firefox-94.0.2-zh-CN.xpi 566220 BLAKE2B c011e86a071303e3f8957ff62a0ea9f6bfaa93b8b328f2e506af83bf0008e990e92cb275488b6767af5dbbec40986c7f7c8c63d1f50c25cd13710d900ef58e1a SHA512 5d67af7ebfb197a112e40985eb9fc49f98885137314c40eed8e7fc136b5d7e97b5a3afc81bc33a5a8eaf1d27cc9a31a32a1eade2d8672abd3765bcc86fce2c23
+DIST firefox-94.0.2-zh-TW.xpi 566884 BLAKE2B 315ff12d2acb993161bca86c3bb3fe69e0f9f90e37d67c0f3c79bcc463b4d1c7da10b70fde8067f85717d2d0435c23f46f5170625c63f06798fb7058f503f001 SHA512 ddfb47be87c55d1707c890004c066f57dd4adedb5b0ca8675854f9c18491d3f765cf1a5264253639c256ec1306329b7e63e15de07aa4559ecf9c680e297ba8cf
 DIST firefox-bin_i686-78.15.0.tar.bz2 73406738 BLAKE2B b08ae14ca3cbe9d2a7071d77df30cd29c67b1ce8b5898d7c315e399bd42aa2bc8438fa1eaff73df5b348f6221687036266af531493238cb27473c069081c0070 SHA512 069b0faa92408adc319527eb3d6cb462f122156a507b3c646bf9a467fb49e5f2b48cc4a2d1dd7f55d8b7f2c6e279d3768100a668e95153ac6467fcc7ff8f94b4
 DIST firefox-bin_i686-91.3.0.tar.bz2 78790051 BLAKE2B b787a845f07ad9b656efe7a94447ee457717a822edbf737100ceff0257f9879527d228879c37a86128f9e0722f0729e4705dacf5f55d7a93635dd03589b1897d SHA512 40328cab4a808f43ce5caf9d2f987492f1c4ab21b0a9aa4b17af334fbef081a0a8dd9cc491b0e0aa972a042d96b41ac6b8d2f195e5c42f71d7dd8ff56e415a38
 DIST firefox-bin_i686-93.0.tar.bz2 77199708 BLAKE2B a265ead5bb91406c8db4688709cb7bdeffaa48e0d0e20daa93841677c2e239148c0e1da284ce56bf3a479f5e5a878bca7cc702804865073506e27361d94b4642 SHA512 1efa973447933eb1e233f96201b64b02aa3207336e5ad2581ee00408a0fbd8b6461d16065676cf784fff2d199083d563f280362d6b0c00bec76a97e0e5cb9b32
 DIST firefox-bin_i686-94.0.1.tar.bz2 77792411 BLAKE2B 09cf5b66e5710a89d0f268dba476445c392c7e17d9ee6ed682033f6abc5adeff959f182b04f20cde598f8d9fb2cb84f5e84d7b7a5f183e7be366f9c79a754697 SHA512 baafd45ffb88a1919b89137e4f56f3e17fd7df56ad7407ee35f340c852d747ab22a93d2b80fb2152aaebd7241586710f2f1b9e7b056c42c856a3ae8fe4245a56
+DIST firefox-bin_i686-94.0.2.tar.bz2 77954283 BLAKE2B 375e9b407a60ad7939849b385d44064e09e865b2354e03288c5328a8532cb7298a1b96200dc516de24ed3866066d5d3b213a4b6963ea2bd09b63aadd62e8ffc2 SHA512 eedf17c71caf8d44eb891333619dc93634c9ae93f05bbdada3fd25994c0947cca9d8067f7fd4dbce6503ae7e793b216c683bcdc520060f99bb970a3024e42953
 DIST firefox-bin_x86_64-78.15.0.tar.bz2 71155495 BLAKE2B 7ab6b6e892d78778136ae83434269a77238a274dd369a5cd659a6cd6068a30be93eb9f023cf2c9fd5c4bc31de57c256a86d48b9c4043f740f72847fe032574e2 SHA512 5c7bb23a9003f4e246a40e54613873051a640ae2a69da60a241e48f8fe413095c46182a8626344caaa3efd4620f9100c2656967106056aa5db9a646fed1bb57e
 DIST firefox-bin_x86_64-91.3.0.tar.bz2 75998026 BLAKE2B 2c87cefaeaa9a2ec69168cafe6d7cb125933c7cdbc1a491bc1d829d5c1d258596e938bb1a154948c2a74995c6b7f4250e37000355d179bb32cdd91686827de33 SHA512 7388472feea9d5c45df7d324f1485aa125e318a442768909ae24c3001abdb2567abcf3ccab9df2d2b5f90d769c649e05c15ba428a529c929829b8fb254c24a6a
 DIST firefox-bin_x86_64-93.0.tar.bz2 74008444 BLAKE2B 6cca65f02207dfc638ee37ac122b1af4e821c05b0ecc2c5861eab6f38fc6b68a7d23ae7aeff44fcb433a79f46d3e306e5c1f228db06eaa33e30a52d597d9caec SHA512 33d5a98ccd2fb33f9315b9d89797b42ffb67610cfdabdf383c0240ba1eae203715e543021e8a59908e14e5a68a884b455e94672e222b2534d92eba62adc30eb1
 DIST firefox-bin_x86_64-94.0.1.tar.bz2 74670989 BLAKE2B cb5871eb3b946b67e9c0c13bb2c26669d2be60e684bf62124258525bd646c15cd5d4c3ad86bebdfc9791830db2215faae21a35f1c1b3929cfbca02fa48a87840 SHA512 f5b00121cc465d76ec2a399aee1342baf42ad6e366963cc88fce65337368d995859d76d4ab2d42d0f92d78256059c899761c022714e0423eee25426e0d0dbaaa
+DIST firefox-bin_x86_64-94.0.2.tar.bz2 74771512 BLAKE2B 567797212063f68aed40471b125baa91fbb364f85410b2f81cdc5a03bc383d548284d9f479e7d26211c560ec0a66df2a3a86a5f3c761614436676e41368603dd SHA512 49c556fa337916349db21b6a01f67ce036be19eddfa7842f01af4c2c296e27c36217df5f398846651e83f612c5680acd8a7dba2cbc50d5cf189e073fbb82d854
diff --git a/www-client/firefox-bin/firefox-bin-94.0.2.ebuild b/www-client/firefox-bin/firefox-bin-94.0.2.ebuild
new file mode 100644
index 000000000000..dd4f26774a97
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-94.0.2.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 753e42f7acd1..c716ca58df80 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -392,3 +392,101 @@ DIST firefox-94.0.1-xh.xpi 420859 BLAKE2B 68842d4622acbf1a23fed065eb73d9ee82922e
 DIST firefox-94.0.1-zh-CN.xpi 565916 BLAKE2B 319fc21bdccf3989caffc60018720afda13be5c42bc109a9513b69e2ad5ad7c693fc91f8cc71f946567172969a798fcce9ebadd98732f46f11bf870e32de9431 SHA512 9f1e6321a0add7866bfff43acd1d128976eb46666fe672ec3ad632a556b1e20bf771b9e297becb136bdcb209e3b8f9e0dfcacadabc6c8b2f91c52dae230696e6
 DIST firefox-94.0.1-zh-TW.xpi 566573 BLAKE2B de71dcc798dbb394b9400d5801bda945cd80ded6c68c6e6c4c02bb269d16edfa00c02f21c361ab497071b25a2abf7520a0bca89b370c1bcec9b032c12f08c72f SHA512 8ec5f1fbdfc8d7ce5669f652b2bd7392048559fe8ff9e9f9ab43bc3071ef4272ddeb5c607148ee426e1722fed38cccebe972ba0b7fa6539f09c84ea804610a9c
 DIST firefox-94.0.1.source.tar.xz 383929000 BLAKE2B 2683906fdddf1b11229affd5aae3df2a7d5bac00e79c10f0c3a8203a456fd4398908d4b5706a1dda6b22caa6435074e7fb629698fd68a223cfdef377ca3e3219 SHA512 634665ed64f2ef205fad03ba023bc915df110c0d4b0a5e36aa470627808fbb3bce5418ea607f909d4e1eaf7d90c5dcacf398b8a434e26906dcfa366292a18b66
+DIST firefox-94.0.2-ach.xpi 447241 BLAKE2B 45ab6c5afa8f211801b2e5fea93c0bf0c70cf7a3e5c6b8880472d82cba0fa74250676e71e5602702e4f3cea5958fa5cd571f1f9315dc912c72c4b1fa435d24e0 SHA512 ec020c6d306e1a948924ebf4981f408870a7ddb3c4f234a28b8dc02e0c62f354411817ba3cc482f2c2f11a3a6e4a980453de05b348fbb9ba36c0cd0e09929e33
+DIST firefox-94.0.2-af.xpi 418686 BLAKE2B 688ef4c0cf5ec982549c0983d765409eab54624fe7e9d056c216626dfb0f9614b8c87e3eef58ed2cfd25f18fb481993458611828252b26110e970e550902cf36 SHA512 f5f8e4d0767de05266e7bd708de617a5f0e62e395c4b3b8569504e59407613a47af0c83ff18f568fc70f8e533cc07163c1c9477cbec29b53dbdb98335ae573e3
+DIST firefox-94.0.2-an.xpi 494464 BLAKE2B 26ce20f2c8bf400a19f2fafa501420ce340c027176ed9898760df1d491677e57ce622f953c83256afddf565a858328fcc678240f2c4591b7b16696b66280bb5d SHA512 0e72c470664fb899b7149467dc09baf808ab598e5a196733dbf81015218130b5c6a4736ffb0629030a2f9cebfe6384de8ac370b3fc4da2ab8843bef63060675d
+DIST firefox-94.0.2-ar.xpi 553194 BLAKE2B 8e5399faecbd123455d68012dfcaecc327d0bf0d39fcdd79354fd9e8bd32adac35ad0bb251d12fb3ad47ebc68762e5a06fff4343c3868d5cb7992f4ef5fbd387 SHA512 60b4586507ec55a97b37699d1a8ac0cd83a2dbd902536fb515ac2af48249d2c88b45784a445f33d841778e8ac52c1d63e36c8ed8f9b1030ff8859597687126b0
+DIST firefox-94.0.2-ast.xpi 492807 BLAKE2B 33da379ea64ce2bea60dc90538f68ca744c0892fee90dafcca586a20ac54ce7ce29a2623661f556f2b261329fa05d2a74df5c8c92d3eb35383f26e8c101fb22c SHA512 d3b254251cc2116765344b444c0c8a30d91bae14241a4160bfd7b271ef17cb3413ff0eae5fa59327c800973e8e92b3d52458cc4a1666fc726f75f9b40f183b8e
+DIST firefox-94.0.2-az.xpi 482933 BLAKE2B 3554916b8eaa6286e04d6e9482c9fb6160c02776fd925d2463ad776d6d8906596e3bc8d70fe32464ed053ae7282a6ac992e37c6fcef3132ac130797b6a67c5b3 SHA512 c719aa86485138bdc440fefb2310af32ed8b5a829fb718e137ec3cc670857631f9efcf4ef647d16a9a29b4f11f04ef2c3d919e6d8ee567bfa327b0ce0d0e91e4
+DIST firefox-94.0.2-be.xpi 612140 BLAKE2B d70c5edaec128c881a5a3aec89df266f41ad38edd464726a5db6bcbcc4607d37ca37704cf85aaa4d865f28135b6ce924b0e23ff8a5159b2095d08304132abef3 SHA512 a7db1120e5c0c304df64af6d9b7986eccf200dbd5d6c31c9053c87550668eb6410353c765ffa0eeecac7beb93c578588fe435496b5a43c7a396bf94a690d3b0a
+DIST firefox-94.0.2-bg.xpi 561583 BLAKE2B 944ca406c6325efc03335027510fd33a41411705c3ed926f4ca3179cdaf4a84e71f110f2be7268b331536bdc3d92e15d30ea5024e43c3788d95b0c1e3d7c3c0f SHA512 8ddf87b6c45ee8c31be1df9dac94c5673507a6e2a040dd1dbd412edd4a269b030a49fe7e4768d75078154d30a097b2eac01ed981a4fa4675411a259afde09580
+DIST firefox-94.0.2-bn.xpi 549624 BLAKE2B d3c299b557cdd0afe464e27a6816257811e12f41f446255fd1f2c40631927ab9ef1d765ef9375b3266d27e106853a754298f65b2acc2a0b89dd766a9d66d6cdf SHA512 e6c19ee05eb5fbfa7fb5d755bb22997e1ff645a636424a03166e609ff0947276ca70166c48ac681aba9c7ee3e14aeebb406086f1969eaaa53cf074fa54caafcb
+DIST firefox-94.0.2-br.xpi 518905 BLAKE2B 4cc925352c984328035ee4af4b348edccec50623f4a910ed6d818fb84333b7a8ffc8e97972eb8e33f33e7cb92e4875c45080cad973c8880d857e7b1333a78fda SHA512 102092ecf445616c6331f21c760feff7f2f1fdaddd8881cee06bb4e8eba5d96b784f134fb44ccfd3ac3b19904aa6bf5962254ece0ce03dc9f4ebb24376052664
+DIST firefox-94.0.2-bs.xpi 457706 BLAKE2B e55946902028f0b78e9029e8bf1594502187c6b6193c53afa3e79668280d7a03d506090b108e2799e254a60c3d6732fbb2fa5dadd54c47ecc150bf95f24d055e SHA512 ca59825b983f9a5f9561cf150419240f967c1bafe184adadf12819da3c7e2a1941289ad5625ed222a308a11ba3dca818e9806a386dac7890b51f7cd917a894c3
+DIST firefox-94.0.2-ca-valencia.xpi 523066 BLAKE2B 2decde5c9fe01eb4f7a9d99b0d17569eb29934613b69a1b18e3cad6cb85be1e6b3d0ed1ebdc4bc5a84d9c66376b6af50afdaef84cfd7701ecb4e70e67df9084b SHA512 54c51aca43d74f7ee447dcd091895036ef81c22cbd54afbd22790085b53c8a7b0a238d3eb8849b4c5549d742cc7d3d7278ff40b0f480d2a93bfa85b7373ddd14
+DIST firefox-94.0.2-ca.xpi 523662 BLAKE2B e0ff8d1f14e6181402c63d0987053cf86f141919121b8d17c26eed0a6423cec6dbad57455ecd617ec7a6d8aedfdb0302a0b04fc5fd46d824c0f38d2c888c5f03 SHA512 8ba8850570206a89bccf8fe5a6d49ab6273547db2e62dc9841916fb8fa1c973def60031cf3bcb6890935b2e5fdc7d2bc489ea4d5ec05042a635fffc5325986fc
+DIST firefox-94.0.2-cak.xpi 547147 BLAKE2B 7dbabb3ed8e2b168de9ced2b25a434974eb6f6aabbefb09068d9592c2e951c5aaa17018c45978c3ace458e3943d7e539901dece19a0d4c64fc5a985570b2d1bd SHA512 9be5f51886a00ace70345ac69bb9ea6e58a58aa8c35de176bbd9b21d94c7b1f93702b7f38f92c78761463234b031515238d8820d04401319dbf91141d0c17629
+DIST firefox-94.0.2-cs.xpi 555218 BLAKE2B daf21053d5b2ebe535a9cb83e1a6848add513f66d0fb18ec4a80bce0425907a5f12b020b38ba0bfbd4f88d629de31d19cb6c31f5d5ff463c3100fd7cdd9599ab SHA512 4ca3434e3e4b9869d01070d23fa2a4abfe40c92bf0917c14e7e49a92d02884a7f768e3008d37bdca9c0df6ae9333717f661356415c3501b9456dd2d35a0cacfc
+DIST firefox-94.0.2-cy.xpi 533601 BLAKE2B d7fc74e0f52a114874d2f2cbc308f97773e907c44bcebe05881387cbf75098e0b3a77bbd381d9851e5673baf8d15f0fa0004d6f5b97071fd727f6a51a755454c SHA512 a777f48021b2f0b9ce36c88489999bfae5fc53fcec07d1e609678a84ecb9cc9259043d1c3837a92bcbc2cb27e25cec8b9da32af8e80ce920be7f9e0d455aa1d1
+DIST firefox-94.0.2-da.xpi 525484 BLAKE2B c56dd25b8becef8ca454f0782aae86e708fd8015594c6eff7c509fd8b45c29ef40c3534b9ad561fea53fa4925a63693669a5f200a27e25f72c4c6238f5819d76 SHA512 fed02b6865402a2ad4fddaa6916da5948ed2b0e69e06211ed29f615970c5940676d64c6d78e80ab465f3377aa2b75198197178e83f09ae743e155af22147a4a9
+DIST firefox-94.0.2-de.xpi 544439 BLAKE2B 37c346cff36d08de547073b1754b52fc76fbd9612ac472ea0be2912a9d4b441d448d91002b675ff9569a048fdc9fb5faaaf975f0fdf62157d7f818642a5fed76 SHA512 d51293f16402c73f2e233de57b38250cbbf7deae94ac6ae730586c0599d9c76a1257a3dfa8a54d1e18836647e66ef2a8a540b44b13de4814cbb1d6602655fef0
+DIST firefox-94.0.2-dsb.xpi 556987 BLAKE2B 1a0808ba177c13ac1489cb9ee61276c4d9d60eb41da5652cf061d2364d08b9ac5ff3ae94a0a04fea172d85978f45c0cf53ab996e626afcab32e6a18342fedd9a SHA512 fd9d171db4bc27bb38d7a6909b5fc6ea01ea106fb8ef6918a192fd24782bd97b1c77f81aff9e116cae4e6da8b4ff58cae419401933e97a90484a572c1b0bd339
+DIST firefox-94.0.2-el.xpi 628739 BLAKE2B 3b455a0660c18017cba3f56ad41fcf9ec1c5c9dfcf8458be523afbbe90ed96b40ac7db6160ddafdfe47de15372e7fbfabdb1cb30ab714ee7e03bf1a637d66124 SHA512 504fe04376d5782ca538b63945b4744f744b4929b2b81db8f0838d7f5ac8af811aa3d8c6ef18ae6f4929688472bc2d7e5bad3b71ba4e91d412ca59d4c99ac3ec
+DIST firefox-94.0.2-en-CA.xpi 502078 BLAKE2B 358f757912ba094351319bff00c958320a4423729113eee165f30cb73f16a45e01d79df3b7d70a2ea6f380eb30c144eb7d139958337a959356fc3bf903ed3fe1 SHA512 b509c317e8c890aec87586c1ce90ebed7e14410bcf3266a57ea0a400e95a6487d52d55ede0d03816489ea90df05d9c802a2679b62ab1fc71f212ed00486ee4ec
+DIST firefox-94.0.2-en-GB.xpi 502586 BLAKE2B d9f3f3d497902c8cfe31dcb62e893053ec66e046dcda3dfb97b5712a594329b09d281be5ce6c1377a48aeb9372dbf801da3a02db2eee1973b76ec0a54798d95e SHA512 d2aaa2faf36aa8f61fa9a9d02d7c41170205089c9070b5bf13ac3f930d3e521e4cb8f6eed7a1dca15c0cd722b8bb7e76683d1d772f1bae25ae2a30ba9831e6f5
+DIST firefox-94.0.2-eo.xpi 524537 BLAKE2B 9637e339a8a35f8e4f35e6321e45eeea2d84cb586aa26401a41b3bfa8618eff9be845c2dab6837e59af9a3cba7337f77c66e581cbd3135f6337dc83f90c15f31 SHA512 cb69432c7ca6df7d81e61fa32b8a69d5337d169c9218605be96eba6463145e51b2e4078cbcb37450d59f8630b6139c0812d05a6c4ae27cbd1918f40f42f83ee2
+DIST firefox-94.0.2-es-AR.xpi 538014 BLAKE2B 6b979232a3c21b1dfb04fe9f3bd29ff4ef3466e153357226cf8cf7d5ab82e1888cb3f178a0fa08a02d86a1654f958735c779422c69f4ed44440953205d382b7a SHA512 b1a3a27298396e05f6fe167ca769be5a3fda8253f81e0f395bbe6ba69649a2606d1851642fbe8aa45021912f7f3436630d39ebe21e41b263352001eeb5e99045
+DIST firefox-94.0.2-es-CL.xpi 537549 BLAKE2B 62332c3785d4431a720174a76ba369995e4d9cd72fa66a87669e8b9b57448445633bd54a1b4cea570d165cb1334ff7f50225c1767cb04be2200ffc44f832ef10 SHA512 13a1fb2f8d7f0c29009cca0f83ba474f2d0491a2fbc75c5f9608034493323d04b1910a4fccae7602aece17437c2aea51246df57cdbfa22114810e3a610fefcce
+DIST firefox-94.0.2-es-ES.xpi 528306 BLAKE2B 26f92ee9d9e8cd6a1962fa476cb3999c8bc37ff912ad7ad49a47ec4e758ef6df8f887a28099ae7feecbb1ed4482d5da55100703a23c6a1374e187cb2796c3d5d SHA512 8a968018cced56048dbbea3cb05823ea82e144701e71e537b7e923a2eec3690171fba8a2ecb76d75d4f4316d399205489fed6eb229dfbc0467417a455091e6ba
+DIST firefox-94.0.2-es-MX.xpi 537717 BLAKE2B 4fdd83f784e62451854300b14a24c5a5c48681c98fd158253bda6860bb427495c8256921301f955229e79e044129948ec0279a756b33b01dfe5ca6d708057a61 SHA512 04cfdc6b5b330926111b99ac191be07495dc2aa1d3825be6034e7069029a43b4bfbfc85fe037c3a2f68cd1fa743857adb7170e022050751f7fa7b2c19aea8a50
+DIST firefox-94.0.2-et.xpi 476279 BLAKE2B a7e0d032c7fe9e591ada8031798726b66f674434329604e28be24557ba67c51a9405ab6beb36bc6d7fdb077abb2a530cec0e742efaa4a4b78d7b169cdd2574d2 SHA512 c51912680984fa5f03fc4c1b7b097d3fcba6cca80ea5ae9663dfa19e79a16d5f881c30bd8a68758994e4a46e31835e6b061ebe7bac3d619163fe25e636ea091e
+DIST firefox-94.0.2-eu.xpi 527862 BLAKE2B 5bb985414ef6fbc11fc94410ea8b04232c6b3273da002fa4aecba2a361425e03aa1ce54bb035f1db54f11b1271c7746c5c5832730336199be933584c5744c69f SHA512 1cff76c9782bc3a0fe2bfd909f16bc460d9814b1ad9b1dfda75d7d2ab9054182816e050f24f0ed2eff81b76a0b85f7793da8ea0383728d94db12367b190ed852
+DIST firefox-94.0.2-fa.xpi 549491 BLAKE2B 49cc0d17fd86affe21c48add896075d59b1e89be7da79abe3b5c89b0916e878a22db42305653ae46edf67c462d0350eb4504905bdacc3c61703bd0cbe947c1bd SHA512 de8ca0076795f1f7a2157a40a8830a814c42b4582eec71576e55291faefcbe0cc8109663eb0f5718df29cce216a42875aa592e09b7817863659041bbdcd0cc58
+DIST firefox-94.0.2-ff.xpi 465162 BLAKE2B 48b906dbf341f839e2d85d0957e23ebab7cca06bf24bd59560371aed848e15b8aa4b962e401ed1a70f761a855e3454b61005661bfe7d8b619f3b6bb21db148e1 SHA512 6d461ad28576d2b68bf7e9cb6d07a36476aa8313a99f22ec2f0b2cbaa06a19711b633067d8e455a9a888baff2b3d81d92a5718c806dfaa1435f4cf0be78dba87
+DIST firefox-94.0.2-fi.xpi 521930 BLAKE2B fc7540d31ed78481dbcbe61ba6317bd476a72b4ba5284bddb3ca0258ecfbc3dcfe2d579478eed7487f17cc64b882e13965f607d7e0d2d773412eb76ed68ebc27 SHA512 227d347a11878045a8dc9769a5cc3a42e703f18ce55de5fe83affc1e42d140bf3653d46d8a58b66cc0cbb38d03d04d5ba7addc00baca52cb382bac682234a68c
+DIST firefox-94.0.2-fr.xpi 548695 BLAKE2B c9820a1d717471c79e6a75274549d3b61a11d2629aa9bbec62550ccaad70c03cdaec35ee8989da512f3300a948757deca712932a3407b9c84148a6403c1128ec SHA512 6b216502876f0c4a2249036657f9dd524630f800d6f56e222b9d9ce17dedd4c9fb3957bedc9c5ab9d72d75017fb568a906ba423d70ab828813bea29200d69db9
+DIST firefox-94.0.2-fy-NL.xpi 534445 BLAKE2B 64c91aa7877fa4edee358829601e7ca386704daf0bbac789d91c9c9d6b5e68e5679ed3e4fe43d05359f347545567647f40ab191cb58d8c2e5cfce5a90ac7b847 SHA512 3d74117bd5365c15f67f905846d1f4b497af2b4f00b8c933d81faba7496c08e23c0ebfd3f44e0dff961b3a24e55980f46da2448a9728939ec53a0943621ab745
+DIST firefox-94.0.2-ga-IE.xpi 453332 BLAKE2B efc2dc6616c87151845b3e07605997af96179b6c258b67f0995f5c9ef7a8cb45cb51bc0273b08401334877a5496afd3511f6c50e6fe4194e67494960dee7bd79 SHA512 63f900ebc7bb2e5d37da544807f94379e2b84b059a5570f2296cc08fb490c64ff4f024d1be1159213379f92e33699cb27f35df88834492755a2024afa42c20dd
+DIST firefox-94.0.2-gd.xpi 525506 BLAKE2B 81216eddb619142f928738e2ed078c45de9fb6a826db120f6dd3831dcb2de3412aeb1901d6544d4b1fcfc6e98c658f0c2a4e1e19f1d5817b4cd1b83b23c83f08 SHA512 0b69b62f04192e82b1a78ce36b3402cd20966c7c229fb5c5cc641cc616409374658bad0b64c2c67c738e8085b44c827d44b711f0ae13636167f299bd012c967f
+DIST firefox-94.0.2-gl.xpi 533070 BLAKE2B e70d280bcf7de7797e4d6840ec6e110303cc1b3f17885f29e89322bc8fdfbbe2432cfac5625f791ca31bef8e1f30e1815e0ceacadedabd38ad679bc9c67c3aee SHA512 150f442e6f698e162a4f66bef67246bc20b75f13e9c7876aaca324852f8a356054f4497531b5a4b363933f842d97c31026cc72864ab8f6b0eb94010ae31d3619
+DIST firefox-94.0.2-gn.xpi 549083 BLAKE2B 1206abf3ad515b66e1c7171d21b3aaa959aaa8e6af8b24409741000401bd6d86f9f7db4849bfe5acab25eb1f3e87b9515ccdd6009aebce19f551a558c5b53331 SHA512 67159f16c4c5f613f53403610b4ee9d9157677a48a866bb019b2830ee10376671793afff5da06551c786966f9a2cb16608cbcb66b9b91c209d8e1f2b4afc39de
+DIST firefox-94.0.2-gu-IN.xpi 522304 BLAKE2B 734b01f9316e5a4e404208ff8ae13b36650342c25097eddf17177c35f3c7bd11e50cc6a12ba265d737205d8b036507bdd6786ef0d7afe203ce78988819ce59d8 SHA512 32824093a11e4726c8ca0a80b61737275df096403a3756c12ec60776da73448624800f7725500a684f75af99b3c596dbf2a777261e3ee32c548d29ce6b03e17b
+DIST firefox-94.0.2-he.xpi 548396 BLAKE2B 4cfbc715ecd7a4fd0e2a0972160215e30c40ae46ed9fda258d56d7a99a9d1a83a1d6c8cad77bd258e6a29ed83a502f591e819b09faa558883171d7b012224eac SHA512 aa8df7d8f38add33ca814ad2a2df09837b7820e8eed1f03c5cb3a39f214551522da2f84d0397f61ac5a1454a63acbdc862d11c201c3bf9f23d576d7a7f887dbc
+DIST firefox-94.0.2-hi-IN.xpi 549945 BLAKE2B 857a41445ed57fa127d5d115752f3d88527383104ee49e488f4fa149ca8351da6d7ff81064d1178bb2f8edfab4de5c29990c9d5d1a92ecacd4343759b3eab8de SHA512 f400cf5f672e232775af0d07f324921f29b12a368cdaf80b6d68db7cda343cca69988a66835ee0c45bfe36cdc505d3714bf3ab901b2ce020f7eec7a4602ffccb
+DIST firefox-94.0.2-hr.xpi 524458 BLAKE2B b1b098b59a133b9df1bb66bc6b960aa843da60a621696ac433f01bd8cbca601ca2d8909a707652f5d00fb6695c833d15d04a43f89af7fc0903d2117b52d3de98 SHA512 35d566be8614be5e9264ee618d3128e3a26db7552f88784d08d9a7e9bade25cd16d2c7e0b7f1f37574bc105ff89d0ea4faf215c691906d5d6ede56800d29afea
+DIST firefox-94.0.2-hsb.xpi 553063 BLAKE2B 450366b43ee00152275fdf398703a8882aaaa3a3f5a4cd3c1e2b97e09db24da1daf0d677690d01ede0f339c069d2690cc6bbd8da75cb3489df0b9fe0ebcec969 SHA512 315ab12db114872919e1813d85d638b21e926f75deb7c5ab2ac76f5e77ada90b9ce68bfecb2d5963db52a1507398e9b8c8f3eb0bfc8e9ab85eadffc15719302a
+DIST firefox-94.0.2-hu.xpi 556846 BLAKE2B a4e07ee7cd71f876393d0818b61f74373b5172dd460c628012b1ade50035658ad3a89bc0a446f270f9b101d0c12db81be7b29a6f5b6e7795177878e6ef53c92f SHA512 2fe86f270a290df8adb1f70f8835739fb62f8e25327692d5e35d080db2f03ec94d9c097f9502a4615de84c33a82279085024bbdc70a1ea41c6cf2bb69e090f8d
+DIST firefox-94.0.2-hy-AM.xpi 571835 BLAKE2B 538218d30b5e1bccbac63d343e65753fabd6982f9c95e24d6d62ca8e9d98936b51c132c740be98f5812959ae673a47537ad61e4f728964d68f8d2579797ad1bf SHA512 aa23c25ecf7ba4e6fc490fe78af3a9ed383dcff0e2afeaf3ccaf093da00d2a4c6f04a1c55e62fd94bdeaa144ca804568dc82089b7512677f87a7847825cc6077
+DIST firefox-94.0.2-ia.xpi 523712 BLAKE2B c9d6880548ab5ad240f4b9cfba5f080d2522eb46c1acf55edd0f1123af80609c0d2a3364a89227c13de129eb47ff3302c2125f8d25845c609cc0a9a8b1259fd3 SHA512 192810aefd0a8527f9b6389de53d511b83ed01ca5bb674bbcfc3246a90c1a1d80dd826f528175b8253fdc47f090bdd5c4d5a7d16a28b648e822c1b3dcd068e8e
+DIST firefox-94.0.2-id.xpi 514576 BLAKE2B 4df208eaffd4d1d483b03727cff684cbbe896cbca27cd0b31e39232cd502b0a7c02063400a10133fd0fccd363b48573a5ec4cb763a70cb9e5995a043ac1d4a5d SHA512 8625c881487aba8ebf242f12a28cd127788c7f02bafd8a087c15cd5e30e9bb9c05bcd94fdc27436d7949d9b5fa006804e9588f037f18a47c28702da13a474b16
+DIST firefox-94.0.2-is.xpi 463841 BLAKE2B 7eef44a0d439b434fd6eced9e538d0a4c280fa9aed2bfb126c3479eb8d831469f3233ec2fa6aff5ddd1eeb44213ddedc57b5f53d2b040a6da527d2806da9d722 SHA512 96b67b975d0e67840ac1e4c2bb5465e36af0473819993f0abbb458d5d7261d4ac05cf902670326a70b541f353562259e6309a780765cfe138de6e27feae8e43f
+DIST firefox-94.0.2-it.xpi 452233 BLAKE2B 044962343d5debe74ac7bb5cbeb56090bc14044d0cc471a6e7eb34345adfd8499f4306f426635a96799c16a544dff605e270563464d3defdd25b19211e63cd50 SHA512 1ed85ab4692e1e125815c3af771c6172854bd2c56f2ed2ac85ac4173b18a0d0a884475d0546e8f0fa8bf639c5b8a6218dcd30829e90c9ecf8ebbaebb1ee57d40
+DIST firefox-94.0.2-ja.xpi 578700 BLAKE2B 36932449855551a578a1a9c4bf33170812df4d5663f3256544745493b602eca35ca95be878cdae1a43734c1bb68893602ecabd8c48a5562174b5b8c712776ee1 SHA512 4cbd33c2a53bfbb6517eea5c58bfe1599ebff52db4395398dbecb6bd369925d4bec6e9f1a5cc07199d6b5154df96b29514ee04d9e2da015395380cb13442ac32
+DIST firefox-94.0.2-ka.xpi 577468 BLAKE2B 21258bbb0a60cab7d8c7d330e1a229448138dc103de9828efb6ba47237cf8ada8f48f75df57769dfcb20d64e5d61c77c1651c43a7cfab9a42cd630cf207b007a SHA512 efa08fb14fc31ace656b7a7bf81e6c8cb8ed1900ff927f30655d28243f3c982e1333bfd39ed11171c680c32f14729323b52bb4fd3b0b4c139fa18ebd32fa7613
+DIST firefox-94.0.2-kab.xpi 538086 BLAKE2B 186f84bb7e6167b87c0e9db92830384536d25d9d27fcaa5636fb963a4b047bff7192f7344c6bce67f6efe7c0e93f49eb3b651fc45c3d058e673d5393683bc25e SHA512 b0862bb0521fdc6ae2f01fefcad830dc544fcabdb0ae8601c5ba6bcceff466babe69fa2e79b5e459fa21ca3bd5ecc2bcff5369dfb7f83f597c787f96be876d0c
+DIST firefox-94.0.2-kk.xpi 597580 BLAKE2B 00db302742d9ed714b072b5ef06fb665fd253e753fad7f0191af1ecb1fe42430ac5feba2f471c5dcd89e4d1e2c4cb45c4e4a18e9ac1c2355221faa338af45f84 SHA512 2ce2467e43e62f1a312bed7f09dc561a5f23b76171915f47d964e470f914f391b15fb93948e0450849fe83f3497fc0544dd80364249bbec71e99ce7865a8989c
+DIST firefox-94.0.2-km.xpi 525523 BLAKE2B 983f37f782593dad90246954c7c9bf705611b98091e7c200503aab575afb9cc819651d25ccc3355faed0f2baa3cdfe01387de6ba9a38dd0eab3e9b9c613a799f SHA512 3de801e2dae88e9c9d7a0feba5197333d2f8ef664100597744eddaef7d62ce975d975fecc27a763140643eef1ae5059eb4ae3d6b440a7e43d697ae220f85506c
+DIST firefox-94.0.2-kn.xpi 490615 BLAKE2B 8f7bb52298e9ceec108e90de61c9eb2e8fe1f55b78e16f8a6d26226651802d0d1baf203c371a2527732ebbea9336dab1f7b9494205fa82f9f7bb6ea08ab53bf4 SHA512 bca36cb7bcfc64b08e8e8230a948aef698a523eb3613bd38ca9e9f4917ead6ad15709994e5015015712208403e03b6469f89bbf02b9f382fd121d2a933596ad2
+DIST firefox-94.0.2-ko.xpi 569651 BLAKE2B 87c2b70d08cd9d92aa3ae4b2f3904193fd7812f79be219f6615b7bfef282dc8bfaee89adb2d5e21a99e5afcd2a7ae4ced3826d7c94758ff5e809be1b854efb9e SHA512 ac1a43e5af677e95506122105ecbc38fd5c583e576a764f37b1db91e5100298d377e997fcbd71c502cd49aa62c0563934f7d1b9d07601f99a6cfd98d8f7b0b11
+DIST firefox-94.0.2-lij.xpi 464138 BLAKE2B b1568ba6af9e5635251bea307c0b2f28e7fdf48f89996e2d3e21d796e7cacecb6dcc018e77293afa9d1966774278ae1529005daf99288f6ccd4536cfba311b7a SHA512 722a9f800d955a9f38dbf876d219b2f0b83c90511502be723ae28cc1a4884a49786c7b2c0c672ee6b271b76e796bae4d6b2c12b5d8e0334be2cabd037279200c
+DIST firefox-94.0.2-lt.xpi 551591 BLAKE2B d035ec450f3c04e3aa7c74eb66c014c6fd1474912526a1ec5f259e0967e84406accdf8a2282530bd1fbc26895be6fb692b9bd6f2149154b447f06a44e6557198 SHA512 c08f442ca54213669b641fdb5b9f2379afc5caf8020fc6f78550e2c27fd8ac9e3fc80673fe2f3ac93b175e8aab591ca08bbc9dc53612b59749807a890feaff0d
+DIST firefox-94.0.2-lv.xpi 455940 BLAKE2B e7ffc5012327d99db8db74c51aa63c04b3bfd712b420184a7d70fa4aa10908626e7877d4afd626380730bbf4e5a7fc2730b50cbccccd7bb7c2786cc74b3c83ef SHA512 2aa638651be14b78d2c65945708473cd34996465b6f1800d250f42b7e6f2d43ee13046902327f8620298f6bdfa9814def88faddb75deb3c0e45c93ebc697601d
+DIST firefox-94.0.2-mk.xpi 457960 BLAKE2B e1515eca79db422388ee19f86231761274ad36c42eb0bc89cca1d6746e16c3338dfda02d892d75641605a2b2336372bee7a26477ca6903d01c3999afc13d78d5 SHA512 210c16a4664638c7e381c795361413dfd91a19c36ec59cf07d4edf71d0ce0433d43b2c31e9348d45b220309a0b2d5a4067750cba669a7a8a58f4007b6a83f013
+DIST firefox-94.0.2-mr.xpi 525235 BLAKE2B 526b979165480922b34e8b82a3a760591e86238cd9130d49a51ff56c276994d51dd9e3d347e756eacd255aa85cff5961a76658aec59278e3ddc0764adcb2115b SHA512 b84e19de492c187b4b152f0498248cce68e7cfd63bc9a284659156a24927f7719b2e85ddf1fc3218d7030141093e73c1d082eff6a57385428cff4351e8b5aa2c
+DIST firefox-94.0.2-ms.xpi 441057 BLAKE2B 8ac9392bbc8c504cd04e2a7c138874052de3b2b9343ff5d07b222b5465c45da7a54127a56e092bcea707d10acc04b25b617b6302f43dcf35965bbd17b7ecb46d SHA512 93d0d0ab0cc7d0d26a7cf0b31d9f163ea43b534ecb649b92f5ce6de74c0bd12c157466b8f3246d4e1c09ba5d98f9218366128f58d279e3450a69f5e54639222a
+DIST firefox-94.0.2-my.xpi 509497 BLAKE2B 2d060045a1a9fa7e44989c9c829bdae661d5c9d176ba9d25baf4827ed9935a7887aca420fab12a9976f0a29f8f198b25de7cc248810e9e8f791afb82e1ab56cc SHA512 63883498a51f5678e6d347fae82bf00ee340bb2c1b45869d1dc7ab1f4b61ade479e63cdcbd3d09f9ef332ab253374c77743a3b4d2e5be2f8e9404f20ef260ad9
+DIST firefox-94.0.2-nb-NO.xpi 521046 BLAKE2B 340855390db573b72b196a379614a3cfeab4313b6e60615047714b261c6af3eca2a3403d472deb7a3d6df0081a89f1f1dec8fcad04206fee298874a16dfd7fc6 SHA512 7dfd8390165d2e509e1affbdd25566d20a8e944f6a54fb8a1f48423c33708b85925e48c885a9890ff1855f7aeb82c765e588089c5ffaefe9a9ed17766bdf0a83
+DIST firefox-94.0.2-ne-NP.xpi 468907 BLAKE2B 2a0d563b692a5fbf3dd3a3133380c693a85da0b8c1235521b0ed8fe8dbd6aeb45e57356f3d0f63cbccb9e92f4d942320ae6d9cbc32f7081f42ad51c22444b123 SHA512 ef9f9bf8995d7f6183d97a7f639c4a5abab9c299223f31d6f82ef3f745df51934fcdab352e6b97fbf43b7000e630a3c6f2b30a533d893e84924f8e5fc680020c
+DIST firefox-94.0.2-nl.xpi 528560 BLAKE2B bdd594201a354d73f1caf73198ec4baddb8c9567478c04fbadf1426af2b4744cdef394cef98a43a8bc61d7a203998d753afe4b907f580802081db0227000f14f SHA512 301d4ce7a5ccda8ef5479266782b5948b5c0ab1b37a5f037eb09d6eda4065ab60523cc1f504446c0d5b37ea7c28ba6efa8be3439da8090bccc40a500f1642a31
+DIST firefox-94.0.2-nn-NO.xpi 522400 BLAKE2B ebc3667ab6391f81e93479b4911b06bf79f0ea8ab57ff28e17c7a3c4d549518dd7c292646cc3ed92e60faec34360328f3bc572af32e4d7f43c1288681b2c7240 SHA512 ddaf7a087d023a5e5bd2732f2d47ba022ea141dc48245762ea85374aee5f32234f54be2e95b7d8c9de860320fc4eef9df77bd2b17caf5a74e3e32af0250e6cb2
+DIST firefox-94.0.2-oc.xpi 544144 BLAKE2B bf087b4cacfd9e1baa757450232bf262f72a5834657e10f04dc7352f2d7aa8b43aaf437ce043239677f36242f8eec4ff1f1090f944aab5b5eef20b181aae4fd3 SHA512 5400ed47a38fd5796e36376426f4ffb8b06e9926a3f78b8d36bd2ab549aaea89b441b586453d366d3d403e38f2b408cfce2c35f50585104fc8c2878b1a90bee7
+DIST firefox-94.0.2-pa-IN.xpi 584317 BLAKE2B 5c159d54d4bd428a67970e4a9048f60fef1041e428b61ee44240d4598adb8dc13778839606c5fb650c771cf0df35c4a28e670b2d4d6dcd714cfef6c914ffe121 SHA512 a84a38b34d2a51c108290f422eb43b47d3939d7417070b92b907599e5c7d6dfe1427004c843857047df8cba1ef9cf47faec8e549daded7d0d9a3beefd0938aa8
+DIST firefox-94.0.2-pl.xpi 547911 BLAKE2B 8b9f80bdf28617bb0919e7fbcd2095f64d71f68348309cc55eb61d6a45edbe1c3d78c67591010fa8530928b940dcd7caae9e9c831b4eb6281726fe777ed005e0 SHA512 4d80368133d654733fda11b9f63a27df9a30b2b2e57b9cb67b21be18b6927b420e014913f56f16c64d4ea183f3db9da17ae5caa83ec5641fba65e163aa69a4ef
+DIST firefox-94.0.2-pt-BR.xpi 533801 BLAKE2B df1dd50dd2b55f4fd5cf8daaee03970b82665549aa9e104dc38a9cd74335daa04247ce47c52cd3af4be755a00d3a1a30f4ee85a617347d05d89dc8dff293e087 SHA512 f710bdb17ded7aee9e6da4f1f4a9b363f95c7666b9e79ebf1f405877582bc87f57032d4e0d92b1477d9cc0912f762244de797ebfef04c80d1a0b23c9a91b8819
+DIST firefox-94.0.2-pt-PT.xpi 537467 BLAKE2B 510c74c6f82d9ba2b277ba0b5b11ef783c61fda7fe76bee15e2fda49610f7af34526f3e8b67989e32807f3831d505b3fca7f6c2b93f8c728df4b3d2332c93b27 SHA512 84f59904beddbb13ad02b7520f6b61d4b36e8dec52c62ec905d12cb96b36ad5da3572b0160eb5d2ee3461f9ecd1fc9d924c80692c0d18b08b055c4ac5a80d0bd
+DIST firefox-94.0.2-rm.xpi 528343 BLAKE2B d9bbcdd68e4b8d8b6fd67bb0f2ea2c59bdb0cd4afd167da16cd17e91182067df3fa45e752854e60b7c58a580f0a242b2a87afa37528afc8449d24a7491cb4d9e SHA512 64fc17c5a788e4273a6eb0d09d20a1be71944857e4791dfef7bffee9b8a63d3ff0364ad6f6c23c3357e299db36947fba584f076adf15c387dfd3e612ea9a9c97
+DIST firefox-94.0.2-ro.xpi 523149 BLAKE2B b495a55c7d19016d075eaf867e0415f2d817fc382f9d4f8fa3d75c0fb70a1d6080455b75241a56939453257304396b86d0376d0458cc8c189f519bdb948bc459 SHA512 5662a7ba11cf1d6648550d7d6fa2ab30bff9b0262372356394c2e014cfb442968cbf679b9debdd45939a2a549b99be08bddd80011aa4db9ab914ea7b09824de4
+DIST firefox-94.0.2-ru.xpi 616898 BLAKE2B fe7d409353fc84436b4106c767c00323cbb26cdab9c931e44a5a0ee90605258e3b599aba863eb685e0bde852f46bf10e6dd18b4510817a9cab984a2df075ca96 SHA512 d886a5815b686a95e37a35408af6694dc9566c13731424517e9b78033f1ea8d818b31edb406872e467b09160f430c3c1c42f96a634ff23d05434d26c35adc053
+DIST firefox-94.0.2-sco.xpi 499431 BLAKE2B d0e9373beb7951ea8a69da54d19b5386c651555db0d5922260334ee0459555fecf94e86440ad9fc81d7dc13250f288c16d8e9146c631813a6287df510ff9bdd1 SHA512 1cbea6de062b8307602a4ab1867ff4ecf4676da5487f069b7750548b3a3093d9da3b43c1b8e265f5e62f4ce87bcadaf39af7cc10a46b1319b48cfc4d97511a77
+DIST firefox-94.0.2-si.xpi 480775 BLAKE2B b71e3d687fcdf17e66ebbb743023f68e91aa4d05a097eb20a9dc813c1ebd600886cd48bf125214df5879e988c0a2b004debc25396825b5d3ae3bdc3cbca1c8ac SHA512 adb1c1ea6c103fb130b8ea2bfa47fcc80a90ebb0c55ce024800dfa9c7cd52d12729293188598148590eddc26f4c993721482b0a8e1f80c421f649cfe77138323
+DIST firefox-94.0.2-sk.xpi 557124 BLAKE2B b30d60616a110183caffc134c9c023971cbe7880948af9b622a021f2ec1c6d0936ae0e5b8598420da564917797701fe3a3d853a930c970aa44cf29b1dff6309f SHA512 60b6dc0bfd9c84ca47918b5da5d4d01c3fc3934aea36202a3436efc0bfb432a7ad39b5da582bdb9db79c2db8c437a0213cce5075ce52ace135285d3b4a52036e
+DIST firefox-94.0.2-sl.xpi 526081 BLAKE2B 6b521955468b1ac1bc5eaafe5a82633160f817d742fd339fe5c4a9d57bfc283123b5b38ac6123c5e20e80ab70e07818a5cb3b788a21d1bd7fa46e4e05f7026d8 SHA512 a1906178bf30c1b95c684a9fc6f20fa698f46b71e9ce41b42d442f7a892051821a8782081de25771b33fc97a3003c2ee646e452beef15a30fee9e39819ac983a
+DIST firefox-94.0.2-son.xpi 417660 BLAKE2B a2097cc3c284ad1fd6ed76aa14a1503cfec2d8b788453ee2f749ab789fc5a02e3a0bab14048fc88738092a1a8146563c67d8b1919e49cbf99caf31fbefc5d95e SHA512 1576da7385def23b5bfa5f79ba577ed76075554eee35bac6e2803a63568bce79f5974b16ac5444927cde8fd94254d607255d6857de5eed218d51a170a78b6a5d
+DIST firefox-94.0.2-sq.xpi 541136 BLAKE2B 153c9ecb4e3766cfa8be1677d090f5d80a7158b42c93ace2a5b67b9d1c709f1dc9db21dc6d81d2871ffecaac3662d156d59a91e52786f808693bc4ddba11fb6b SHA512 2313bd6a14a6a97a64716f43c239419bf6d03359fc691dd64be2cbba3f8b93968ba48742657b06cbc792787df74821dde035620c0df5569ea86cd034c5cc2b88
+DIST firefox-94.0.2-sr.xpi 578413 BLAKE2B 0dde7c2c41b6a6d0ed34cfc628600e53df01c055694c313d792fc0faecfbd96e555a26ff2bcb063f60614416571c36124b761065cd131c268e8d03b75df053e4 SHA512 d179f74587705bdada49fcef9296b66df7f3f3cd7366aef77c314401765e65781412f7af006f815fcc0151ff87edb5262023035873e9c471fe4435cb0498af8b
+DIST firefox-94.0.2-sv-SE.xpi 531347 BLAKE2B 9994b72b10495e4fc1156a8855480144ba292c003a44694cdf03b74b9e9bda25ecf9b21dfe35ff204096df40e8d914a3d781f4c3c679e87314c71f057174f517 SHA512 f0123ec3a0504ae87a4ee312e599f98c24de686cbe2742e379b3cd4aba9303e8b7e84f07fa85d345431737e4a38bdc0db6637c15511908ea1d56885f3c858cf3
+DIST firefox-94.0.2-szl.xpi 504098 BLAKE2B 03a9df24e076d4d7ef31aa07a7ee73b49051f25f0ab0158437d199c7c66f2eafdeeb32973f686e039660996e694b0f3a4acfe111f32ea6da2edfb21c5f219bf3 SHA512 dd0dbf93dd64f6eac19c4ba46bb71bec8e8ccbb4631c1efcf9f306c36326c04c88e3a63a687481394b6ddd62d9d7a08d764d7c250b3a39dfd71cd5f250c0902d
+DIST firefox-94.0.2-ta.xpi 504998 BLAKE2B a36fced51d868c0c6be302a108a07f6dfbdc6e1384a9465c65f05019fa324748d2ae97e5fbff09127fc3a8f0dbe37d18198fac3a67233a76af603bb036cc2321 SHA512 584784ee4da4407fa868e7348ebd073d70c6695e4c2ce61cf3a2bb15d6997e127ede25f7aed9db6b3134636ce67efbc4248103484a70846451511b0249097a8b
+DIST firefox-94.0.2-te.xpi 543391 BLAKE2B 39011734116e0a010c3e93a3930abacabec508c93571d0a987f8eff2d8449c8f441dfd72d5a47dcbff33fec742980b7808d6ee477e471f63905ad0fd3612bec5 SHA512 dc43b3adc63b5f00e55049de01bafd83a5b0bb653ea78fd243e4abc6177d2d9cef33db442e6e130205adab500578b78e6c21244adeecf3a8ac51643ebcc37eb8
+DIST firefox-94.0.2-th.xpi 593110 BLAKE2B 9c7ff0577261e5cce787bbf12a6bd19462044c0e3417283785adea30ead7c0ac15fb628a6f235e0d327ce51068365ba9a717059d2007b8dce3f3d04456f9574e SHA512 21bc17c9b3e400f60c441c1001a4426b4fa23dc1fa7bf7ccc6bf1c2517263853e29ade67bd74e91aff31d80236209a20013178ff3cf24a8635f588c674ca77d8
+DIST firefox-94.0.2-tl.xpi 509890 BLAKE2B cb035ec0c874830603d12cb7622e0a5cc5d2d400b5f53d68807880bd0f4eaee05417a5b3f9a75e3cfceec7b6185069caf2b8ae03b8fd35fc7e0d82c159e7a0df SHA512 200b5a1fc32677dc919ede7fd287fb0ed225303e77a997d05be28f0266f4fc2c4833537b389bf6d2441bb223d69a78395dfe43d0cf88619867f7cc7bcbfe59ca
+DIST firefox-94.0.2-tr.xpi 543539 BLAKE2B b3b6b6b13954b793917c845dcac0de3a5148c70b0738f46102e9628b7db1b45df2cc81000dcf76e851e1adef26185c8ee5bda9e3fc0d754a489f47c9bdf10276 SHA512 2aa55b25a5940a9950a6dea32204d18871e2d9564eca77c5bda1ad3455dcc79aba9425fa40bb00bf661e632d5ff06c43c5e0529109e8efe436c7f5183809b9a4
+DIST firefox-94.0.2-trs.xpi 484342 BLAKE2B f3e416dcaeffe33c1f711f6944ce535d18853a194e767dffd2861a381dfbd7b74b4142246b65d0c3e59b7fa41080b0e4b6dcae2da65a081e955f3aa77047bff9 SHA512 970138125e8dec4195e6841d75e0ff1d09e11bf45d1599c13986fc31723c40ce8cbf9f245412d2d344dd0fd236506169a1fc42648c8b7a02eba3a00d25230ee0
+DIST firefox-94.0.2-uk.xpi 610393 BLAKE2B a7c985ccc07fcfc1ae1ed2d3cd10a3aee5b7685b72deffcd3d3c4772028aa2bb3ed4497afaddce1c5cc8840cdc3ba51546f94ad5b16fc9d209a20945bb1bd9fd SHA512 e7c9a2d71d405a8eda6d42e5953dd1d3f8ee7eed18183a350ca7f69c1abcfd6c27753e4bb73f8daabab2db96b75c08466de0edf470d1c37c4e21c306b1c1c01f
+DIST firefox-94.0.2-ur.xpi 549894 BLAKE2B cb59be47ed60201051d0b0505b9d2d36a4debfe41b06f91c63a7f398074563074d92c2a036321a79b772861ef8a98e00fee5b9b073f92eb941f8d384cd5cc482 SHA512 47f839cc20daf86f21e279d29e937fcf0b374ee85ce4be7bc848453c32342bd1e089bc27bb9ea0f6abaace25f0e589681c4d657e92f99c45dd4aeaafc64108dc
+DIST firefox-94.0.2-uz.xpi 460712 BLAKE2B 84639e54b1950433806c9f76b09d06c5e40180093905639d43fdbacaa6bd93c9994564304392732bfe7b29b2f5497453b1dc80f9079532f6337430833c2de29b SHA512 9239047d441655b1e0884da8a16d5aea415ffe2600e7ece7661850c61328439f04f738431e52a7f853842b7808eaeabb63033cdaca2997e1d34c9bcd52b2ee2b
+DIST firefox-94.0.2-vi.xpi 564620 BLAKE2B 19dd083641d232cb399e4f8024fe1e5a01a0bbbaed6ce10a87c71d3d9af553effde221235fbf9d4fc6ddfdbb2e3fe7547d24d651f1a736ad4339558604610284 SHA512 df2511ca3e0a562f5d9a7ad29df08e47372aaf63f7bf11d850e8c5eff18f9534fc112007b1da71e0493262404c3865ed1bf40d004ed78d9e001bd5cb5a4cc210
+DIST firefox-94.0.2-xh.xpi 421170 BLAKE2B 76ad46bddd3283e395aa06b740d65a8b8c2ab70d424e9ea39a4ada42006f2a3234d92fa6092a720261ea391a5a595d01d3e0122fc209d8431d434706eae90658 SHA512 e286288b09c60f6d0f2ec166cd64149441891ae8332e15f22d571b78d2b92f7d01aeb06de93f5072f8198151378298636216114ae23948bb0fb9d560d4eba73a
+DIST firefox-94.0.2-zh-CN.xpi 566220 BLAKE2B c011e86a071303e3f8957ff62a0ea9f6bfaa93b8b328f2e506af83bf0008e990e92cb275488b6767af5dbbec40986c7f7c8c63d1f50c25cd13710d900ef58e1a SHA512 5d67af7ebfb197a112e40985eb9fc49f98885137314c40eed8e7fc136b5d7e97b5a3afc81bc33a5a8eaf1d27cc9a31a32a1eade2d8672abd3765bcc86fce2c23
+DIST firefox-94.0.2-zh-TW.xpi 566884 BLAKE2B 315ff12d2acb993161bca86c3bb3fe69e0f9f90e37d67c0f3c79bcc463b4d1c7da10b70fde8067f85717d2d0435c23f46f5170625c63f06798fb7058f503f001 SHA512 ddfb47be87c55d1707c890004c066f57dd4adedb5b0ca8675854f9c18491d3f765cf1a5264253639c256ec1306329b7e63e15de07aa4559ecf9c680e297ba8cf
+DIST firefox-94.0.2.source.tar.xz 382896780 BLAKE2B fb10a7506399b410eb6147b2b0e93f1933b4420cf70b1c9e56210484de5930ddbcdc17e34abbb61734fae7a723a4032d250f872a684096c98f9c432a80b21273 SHA512 00ce4f6be711e1f309828e030163e61bbd9fe3364a8e852e644177c93832078877dea1a516719b106a52c0d8462193ed52c1d3cc7ae34ea021eb1dd0f5b685e2
diff --git a/www-client/firefox/firefox-94.0.2.ebuild b/www-client/firefox/firefox-94.0.2.ebuild
new file mode 100644
index 000000000000..eb7a24217862
--- /dev/null
+++ b/www-client/firefox/firefox-94.0.2.ebuild
@@ -0,0 +1,1237 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-94-patches-02.tar.xz"
+
+LLVM_MAX_SLOT=13
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp"
+IUSE+=" wayland wifi"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver"
+IUSE+=" +gmp-autoupdate"
+IUSE+=" screencast"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	wifi? ( dbus )"
+
+# Firefox-only REQUIRED_USE flags
+REQUIRED_USE+=" screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.19.0
+	>=net-libs/nodejs-10.23.1
+	virtual/pkgconfig
+	>=virtual/rust-1.51.0
+	|| (
+		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.13 )
+	x86? ( >=dev-lang/nasm-2.13 )"
+
+CDEPEND="
+	>=dev-libs/nss-3.71
+	>=dev-libs/nspr-4.32
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.8.1:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( media-sound/sndio )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	x11-libs/libICE
+	x11-libs/libSM
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
+			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
+			# bug 792705
+			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
+			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable sndio
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+	local show_normandy_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2488.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3-r1.ebuild
similarity index 99%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2488.3.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3-r1.ebuild
index 8653cc65e373..5376bd2781d5 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2488.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13-r1.ebuild
similarity index 99%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13-r1.ebuild
index 8653cc65e373..5376bd2781d5 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2488.3-r1.ebuild
similarity index 99%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2488.3-r1.ebuild
index 8653cc65e373..5376bd2781d5 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2488.3-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.63.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.63-r1.ebuild
similarity index 99%
rename from www-client/vivaldi/vivaldi-4.3.2439.63.ebuild
rename to www-client/vivaldi/vivaldi-4.3.2439.63-r1.ebuild
index 3a5626e6a8b1..2fa0d8cb9dcf 100644
--- a/www-client/vivaldi/vivaldi-4.3.2439.63.ebuild
+++ b/www-client/vivaldi/vivaldi-4.3.2439.63-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.65.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.65-r1.ebuild
similarity index 99%
rename from www-client/vivaldi/vivaldi-4.3.2439.65.ebuild
rename to www-client/vivaldi/vivaldi-4.3.2439.65-r1.ebuild
index 010e329fcdfa..0b6bd4b81fcf 100644
--- a/www-client/vivaldi/vivaldi-4.3.2439.65.ebuild
+++ b/www-client/vivaldi/vivaldi-4.3.2439.65-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.71.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.71-r1.ebuild
similarity index 99%
rename from www-client/vivaldi/vivaldi-4.3.2439.71.ebuild
rename to www-client/vivaldi/vivaldi-4.3.2439.71-r1.ebuild
index 010e329fcdfa..0b6bd4b81fcf 100644
--- a/www-client/vivaldi/vivaldi-4.3.2439.71.ebuild
+++ b/www-client/vivaldi/vivaldi-4.3.2439.71-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 7f07ca2c50bd..9f43fb0645f8 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/xwarppointer/Manifest b/x11-apps/xwarppointer/Manifest
deleted file mode 100644
index 8c90b1d63eba..000000000000
--- a/x11-apps/xwarppointer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xwarppointer-1.tar.gz 2338 BLAKE2B c197338566900c9b259cf09aa493f2a112011d58d461e4f6a99a5dfe1a0d21f8371a23ee71cfd084acb41aeaa6345afea02cbe1a359eba25a61b451e1d9aebc1 SHA512 630b64076b6ebab26eeb278c5f222777a8ca150d4fdcdb78c6749800d4d02fc3c43305fe3e3cf9f640e5e5535f7e10899aa2ed31e8c23245bc6f215d0d25a38c
diff --git a/x11-apps/xwarppointer/metadata.xml b/x11-apps/xwarppointer/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/x11-apps/xwarppointer/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild b/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
deleted file mode 100644
index cbb17d8c7f71..000000000000
--- a/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to move the mouse cursor"
-HOMEPAGE="http://www.ishiboo.com/~nirva/Projects/xwarppointer/"
-SRC_URI="http://www.ishiboo.com/~nirva/Projects/xwarppointer/${PN}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's|^X11HOME=.*|X11HOME=/usr/X11R6|' \
-		-e 's|^CFLAGS=|CFLAGS+=|' \
-		-e 's| -o | $(LDFLAGS)&|' \
-		|| die 'setting X11HOME failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc README
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d82d30832362..a7dd0b391c57 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 42890e41964f..60fe56dd80d4 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,11 +1,3 @@
-DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25
-DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5bec4ad6237e5810d0e04349f7269adf62505afaed8456d1ad6a3544525bdb2012294e6b92e68dc3f0338f6fab54aa934bd SHA512 0f4817b66f4e2d752d5a34cc1c8974dd09b4fe4f6d8bf3df896887542c229088edc406a9b2a68a9b353214aa7ffa4cd8917cdb6695dbe2e316af6c444822b15b
 DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
-DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4
-DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121
-DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4ad8e0ea1d7fd4c844dda8d08d72968e3080f320384dcc50caf0ad4f013eec69fe4e8d1444fac665623e6f72521fc3a95 SHA512 f88fd02af55538045e01982e7bda8a7e781ad7fa57a8e60e61681a705a87a402ceab433a5362fe0f6269366ea54b60f91ffd2689641370f20c66dc10d26d1c4a
-DIST intel-media-21.2.3.tar.gz 23025524 BLAKE2B 0652563f8e8494c9fa181822a7af348cc5ce1e2446063c743fa89072ae46c6a4af0c71001fb8249b0306d67a220312f883a8f54dde1981078e6ee8fad71eaaa1 SHA512 b12ff5b3afbc4d4f34353c7a4ea50b1c66746b33920e450d7d17cffdc234921e82fc4c1afb025274caf2a5efbe87e577b6790d0648a52de08ea19b11a103ac81
-DIST intel-media-21.3.2.tar.gz 23069924 BLAKE2B cb7035698bc19eb65f0cf338e7fb0e11a379a27c243566b6f884d63897da10e2ded39523fcc81131f41885508d1413e7960e38cf9cf2d129d7a6a3994fa9b384 SHA512 27a1849ed2f2367e5de63189faa6e14a1a23f6708c45392f661fab819f856bb4a3d0d31754213b084c4f05be3b155b0a80c2f4e330c79879597910f77e3f1597
-DIST intel-media-21.3.3.tar.gz 23092541 BLAKE2B 083cc368095bbc9cf333953855ad94d7a8d633337b967f4f93d94e3c8e23bbcdadad19c1b1032cafc671ae9a9df9be547498ebe84426ad9d91a9e82557095eb8 SHA512 a9da8a627420c5ea0de9413ce0aeb471f40a0886abd67380ead7ffba32de4abbc1741c47cfcfc73d42b14456090266f4dad8d363c8ad590cef521ef48e42f692
 DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
 DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch
deleted file mode 100644
index 4aebd7cdc032..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-    Prevent overriding of user-defined CFLAGS.
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
- 
- option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
- 
-+option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
-+
- include(GNUInstallDirs)
- 
- if (BUILD_CMRTLIB)
---- a/cmrtlib/linux/CMakeLists.txt
-+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -33,15 +33,19 @@ endif()
- 
- # Set up compile options that will be used for the Linux build
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- 
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -fdata-sections
-     -ffunction-sections
-     -Wl,--gc-sections
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # -m32 or -m64
-     -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Global defines
-     -DLINUX=1
-     -DLINUX
-     -DNO_RTTI
-     -DNO_EXCEPTION_HANDLING
-     -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     -g
- )
- 
-@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
-         -mtune=atom
-     )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
- if(${ARCH} STREQUAL "64")
-     set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -189,9 +200,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
-     #set predefined compiler flags set
-     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
-     add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
-     add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
-     add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
-         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-
-
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild
deleted file mode 100644
index 91a9328035e4..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="X set-as-default"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch )
-
-DEPEND=">=media-libs/gmmlib-${PV}
-	>=x11-libs/libva-2.7.1[X?]
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=OFF
-		-DUSE_X11=$(usex X)
-		-DINSTALL_DRIVER_SYSCONF=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use 'set-as-default' ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild
deleted file mode 100644
index 45e9262fd45c..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="X set-as-default"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch )
-
-DEPEND=">=media-libs/gmmlib-20.2.2
-	>=x11-libs/libva-2.8.0[X?]
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=OFF
-		-DBUILD_TYPE=release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DINSTALL_DRIVER_SYSCONF=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use 'set-as-default' ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
deleted file mode 100644
index 885636cf2e39..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	# No keywords for _pre releases
-	#KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-20.4.1
-	>=x11-libs/libva-2.10.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild
deleted file mode 100644
index 072d1d906b99..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.1
-	>=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
deleted file mode 100644
index 6eec248e7f0f..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	KEYWORDS="" # no keywords for '_pre' releases
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.3
-	>=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild
deleted file mode 100644
index fc67874d04cd..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.2.1
-	>=x11-libs/libva-2.12.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild
deleted file mode 100644
index 6eec248e7f0f..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	KEYWORDS="" # no keywords for '_pre' releases
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.3
-	>=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild
deleted file mode 100644
index 6eec248e7f0f..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	KEYWORDS="" # no keywords for '_pre' releases
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.1.3
-	>=x11-libs/libva-2.11.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
deleted file mode 100644
index 86fa73404b93..000000000000
--- a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-DESCRIPTION="3D File Browser"
-HOMEPAGE="https://sourceforge.net/projects/dz3d/"
-SRC_URI="mirror://sourceforge/dz3d/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README WISHLIST )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-gcc41.patch" \
-		"${FILESDIR}/${P}-freeglut-compat.patch"
-	epatch_user
-}
diff --git a/x11-misc/3dfb/Manifest b/x11-misc/3dfb/Manifest
deleted file mode 100644
index 2ea586f222a7..000000000000
--- a/x11-misc/3dfb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST 3dfb-0.6.1.tar.gz 102343 BLAKE2B 220a9fc355f47e1b28a882be7dcfceac2b50be6ca89f5f5e1d6a2df5fe93141b09b7bf4c93e7af9fbbb24e58bc29e42a8cdd881a75154291eb2ca12461433410 SHA512 3eb43dd80d5ffaea8845e84e2cf21599ee36739ac99d558c4c11592363970795e60b30f444229c987f527a0765fa657111d7a54eef84b5d3d9375c7a812588f1
diff --git a/x11-misc/3dfb/files/0.6.1-gcc41.patch b/x11-misc/3dfb/files/0.6.1-gcc41.patch
deleted file mode 100644
index 2a964f66c21d..000000000000
--- a/x11-misc/3dfb/files/0.6.1-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur 3dfb-0.6.1.orig/src/gui.cpp 3dfb-0.6.1/src/gui.cpp
---- 3dfb-0.6.1.orig/src/gui.cpp	2004-07-28 22:32:21.000000000 +0000
-+++ 3dfb-0.6.1/src/gui.cpp	2006-09-18 21:35:01.271923722 +0000
-@@ -70,7 +70,7 @@
- 
- 
- static fileMap fileMap;
--static levelLocation levels[fileMap.maxLevels];
-+static levelLocation levels[1024];
- 
- 
- 
diff --git a/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch b/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch
deleted file mode 100644
index f05e3538120d..000000000000
--- a/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/main.cpp.bak	2014-03-13 12:24:32.155889466 +0400
-+++ src/main.cpp	2014-03-13 12:24:42.482890090 +0400
-@@ -7,6 +7,7 @@
- 
- int main(int argc, char **argv)
- {
-+    glutInit(&argc, argv);
-     gui_init();
-     glutMainLoop();
-     return(0);
diff --git a/x11-misc/3dfb/metadata.xml b/x11-misc/3dfb/metadata.xml
deleted file mode 100644
index 804d13a15518..000000000000
--- a/x11-misc/3dfb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">dz3d</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 68af2b96e7b1..5891168eabcd 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 791084d3dd88..c7cdf08afe6d 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
deleted file mode 100644
index f9508fd80b85..000000000000
--- a/x11-themes/redhat-artwork/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST redhat-artwork-5.0.8-4.fc7.src.rpm 8298864 BLAKE2B 1add8f4138ee506a5bd26ad31ab04dad14dfb7d84a6015a3f870d542ae21fa87826f0a171e0537710983b79f41d054883e21cf92bc23339b872eb817cc86897b SHA512 e063a281fd561708e560d91b9eb276b0caa80dd6060513240a0a31b6089f3c97fb9959091d719dd6e84b47838408c991a9645be9fc081709027de4d2f2c95a51
diff --git a/x11-themes/redhat-artwork/metadata.xml b/x11-themes/redhat-artwork/metadata.xml
deleted file mode 100644
index 94eae5e5710e..000000000000
--- a/x11-themes/redhat-artwork/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>desktop-misc@gentoo.org</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-<use>
-<flag name="audacious">Install <pkg>media-sound/audacious</pkg> theme</flag>
-<flag name="cursors">Install Bluecurve cursors</flag>
-<flag name="gdm">Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag>
-<flag name="icons">Install Bluecurve icons</flag>
-<flag name="nautilus">Install Bluecurve <pkg>gnome-base/nautilus</pkg> icons</flag>
-</use>
-</pkgmetadata>
diff --git a/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild b/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
deleted file mode 100644
index 898f24a08984..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools epatch rpm
-
-MY_R=${PR/r/}
-DESCRIPTION="RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and Nautilus"
-HOMEPAGE="https://www.redhat.com"
-SRC_URI="mirror://gentoo/${P}-${MY_R}.fc7.src.rpm"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
-IUSE="audacious cursors gdm icons nautilus"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	media-gfx/icon-slicer
-	virtual/pkgconfig
-"
-
-RESTRICT="test"
-
-src_unpack() {
-	rpm_src_unpack
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch
-	epatch "${WORKDIR}"/redhat-artwork-5.0.8-echo.patch
-
-	# dies if LANG has UTF-8
-	export LANG=C
-	export LC_ALL=C
-
-	rm -f configure
-	sed -i \
-		-e 's|.*MCOPIDL.*||' \
-		-e 's|.*ARTSCCONFIG.*||' \
-		acinclude.m4 || die
-
-	sed -i \
-		-e 's|AC_PATH_KDE||' \
-		-e 's|KDE_CHECK_FINAL||' \
-		-e 's|KDE_SET_PREFIX||' \
-		-e 's|art/kde/Makefile||' \
-		-e 's|art/kde/kwin/Bluecurve/Makefile||' \
-		-e 's|art/kde/kwin/Makefile||' \
-		-e 's|dnl KDE_USE_QT||' \
-		configure.in || die
-
-	sed -i \
-		-e 's|kde||' \
-		-e 's|qt||' \
-		art/Makefile.am || die
-
-	sed -i \
-		-e 's| $(datadir)| $(DESTDIR)$(datadir)|' \
-		art/cursor/Bluecurve/Makefile.am \
-		art/cursor/Bluecurve-inverse/Makefile.am \
-		art/cursor/LBluecurve/Makefile.am \
-		art/cursor/LBluecurve-inverse/Makefile.am \
-		art/icon/Makefile.am \
-		art/icon/Bluecurve/sheets/Makefile.am || die
-
-	eautoreconf
-
-	intltoolize --force || die
-
-	sed -i -e 's|GtkStyle|4|' art/qt/Bluecurve/bluecurve.cpp || die
-}
-
-src_compile() {
-	emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles"
-}
-
-src_install() {
-	# dies if LANG has UTF-8
-	export LANG=C
-	export LC_ALL=C
-
-	emake \
-		QTDIR="${QTDIR}" \
-		styledir="${QTDIR}/plugins/styles" \
-		DESTDIR="${D}" \
-		install
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f "${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png"
-	rm -f "${D}/usr/share/gdm/themes/Bluecurve/screenshot.png"
-
-	cd "${D}/usr/share/gdm/themes/Bluecurve/" || die
-
-	# replace redhat logo with gnome logo from happygnome theme, use .svg if >=gnome-base/gdm-2.14 installed
-	if has_version gnome-base/gdm >=2.14; then
-		sed -i \
-			-e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.svg"/>|' \
-			-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml \
-			|| die
-	else
-		sed -i \
-			-e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-			-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml \
-			|| die
-	fi
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -i -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop || die
-
-	X11_IMPLEM="xorg-x11"
-
-	for x in Bluecurve Bluecurve-inverse; do
-		dodir /usr/share/cursors/${X11_IMPLEM}/${x}
-		mv "${D}"/usr/share/icons/${x}/cursors "${D}"/usr/share/cursors/${X11_IMPLEM}/${x}
-		dosym /usr/share/cursors/${X11_IMPLEM}/${x}/cursors /usr/share/icons/${x}/cursors
-	done
-
-	# remove audacious skin if unneeded
-	if ! use audacious; then
-		rm -r "${D}"/usr/share/xmms || die
-	else
-		mv "${D}"/usr/share/xmms "${D}"/usr/share/audacious || die
-	fi
-
-	cd "${S}"
-	dodoc AUTHORS NEWS README ChangeLog
-
-	###
-	# Some extra features - allows redhat-artwork to be very light:
-	###
-	if ! use gdm; then rm -r "${D}"/usr/share/gdm || die; fi
-	rm -r "${D}"/usr/share/apps/kdm || die
-	if ! use cursors; then rm -r "${D}"/usr/share/cursors || die; fi
-	if ! use icons; then
-		rm -r "${D}"/usr/share/icons || die
-		rm -r "${D}"/usr/share/pixmaps/*.png || die
-	fi
-	if ! use nautilus; then rm -r "${D}"/usr/share/pixmaps/nautilus || die; fi
-}