diff --git a/Manifest.files.gz b/Manifest.files.gz
index fd8e98d0f6cc..43d677e63453 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 e18187743b98..2b985da6be5d 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-base/ansible-base-2.10.10.ebuild b/app-admin/ansible-base/ansible-base-2.10.10.ebuild
index f7e9e5b567c5..5ac07b2ea362 100644
--- a/app-admin/ansible-base/ansible-base-2.10.10.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.10.ebuild
@@ -43,7 +43,6 @@ DEPEND="
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
diff --git a/app-admin/ansible-base/ansible-base-2.10.9.ebuild b/app-admin/ansible-base/ansible-base-2.10.9.ebuild
index 431b7f154bdd..46ca9a204a02 100644
--- a/app-admin/ansible-base/ansible-base-2.10.9.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.9.ebuild
@@ -43,7 +43,6 @@ DEPEND="
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
diff --git a/app-admin/ansible-base/ansible-base-2.11.1.ebuild b/app-admin/ansible-base/ansible-base-2.11.1.ebuild
index 57eb3a160f1d..459607c5a037 100644
--- a/app-admin/ansible-base/ansible-base-2.11.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.1.ebuild
@@ -50,7 +50,6 @@ DEPEND="
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
diff --git a/app-admin/ansible-base/ansible-base-2.11.2.ebuild b/app-admin/ansible-base/ansible-base-2.11.2.ebuild
index 57eb3a160f1d..459607c5a037 100644
--- a/app-admin/ansible-base/ansible-base-2.11.2.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.2.ebuild
@@ -50,7 +50,6 @@ DEPEND="
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
diff --git a/app-admin/ansible-base/ansible-base-9999.ebuild b/app-admin/ansible-base/ansible-base-9999.ebuild
index 57eb3a160f1d..459607c5a037 100644
--- a/app-admin/ansible-base/ansible-base-9999.ebuild
+++ b/app-admin/ansible-base/ansible-base-9999.ebuild
@@ -50,7 +50,6 @@ DEPEND="
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
diff --git a/app-admin/ansible/ansible-2.10.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild
index 247986757063..1e2357818c8a 100644
--- a/app-admin/ansible/ansible-2.10.7.ebuild
+++ b/app-admin/ansible/ansible-2.10.7.ebuild
@@ -47,7 +47,6 @@ DEPEND="
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
index add264d23745..12a8438bc2ba 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="sqlite"
 
 DEPEND=""
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
index 7a9da7d72d9c..d438a074e47d 100644
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
 else
 	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 fi
 
 DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
index ef4f72faa319..a9c761af98c2 100644
--- a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
+++ b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
@@ -1,7 +1,25 @@
 https://bugs.gentoo.org/782643
+https://github.com/syslog-ng/syslog-ng/pull/3669/commits/b8284f8ecac588f6a321c779cce06cbe182611a5
+
+From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?=
+ <laszlo.varady@protonmail.com>
+Date: Sun, 9 May 2021 03:43:46 +0200
+Subject: [PATCH] configure: add pkg-config detection for libesmtp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: László Várady <laszlo.varady@protonmail.com>
+---
+ configure.ac | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86b67ba9a2..bd6efa8711 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1270,20 +1270,9 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then
+@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then
  		CPPFLAGS="$CPPFLAGS_SAVE"
  		LDFLAGS="$LDFLAGS_SAVE"
  	else
@@ -14,13 +32,19 @@ https://bugs.gentoo.org/782643
 -			AC_MSG_RESULT(no)
 -			libesmtp=no
 -		fi
--	fi
--	if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
--		AC_MSG_ERROR(libESMTP not found)
-+		PKG_CHECK_MODULES(libesmtp, libesmtp-1.0)
++		PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes", libesmtp="no")
++		if test "x$libesmtp" = "xno"; then
++			AC_MSG_CHECKING(for libESMTP with libesmtp-config)
++			if libesmtp-config --version >/dev/null 2>&1; then
++				AC_MSG_RESULT(yes)
++				LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
++				LIBESMTP_LIBS="`libesmtp-config --libs`"
++				libesmtp="yes"
++			else
++				AC_MSG_RESULT(no)
++				libesmtp=no
++			fi
++                fi
  	fi
--	enable_smtp=$libesmtp
-+	enable_smtp="yes"
- fi
- 
- dnl ***************************************************************************
+ 	if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
+ 		AC_MSG_ERROR(libESMTP not found)
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
similarity index 99%
rename from app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
index cd6baea156db..ee66ff528305 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
index 32c3408b5c8e..e4c316ec0230 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp )
+	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild
similarity index 99%
rename from app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild
index 3083efc98107..edfcf0964fba 100644
--- a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild
similarity index 99%
rename from app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild
index a9238b77f778..d5c1a35ee059 100644
--- a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 56e492663cf1..dc6e704df2dd 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/dar/dar-2.7.1.ebuild b/app-backup/dar/dar-2.7.1.ebuild
index 4c1779cffd3c..5acb1d27af10 100644
--- a/app-backup/dar/dar-2.7.1.ebuild
+++ b/app-backup/dar/dar-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
 
 REQUIRED_USE="?? ( dar32 dar64 )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f5c374ef8d47..f1022f5688b5 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 43b574a667ca..c931e0f70fe1 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,2 +1 @@
-DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
diff --git a/app-crypt/acme/acme-1.15.0.ebuild b/app-crypt/acme/acme-1.15.0.ebuild
deleted file mode 100644
index 37a6145366aa..000000000000
--- a/app-crypt/acme/acme-1.15.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 43b574a667ca..c931e0f70fe1 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,2 +1 @@
-DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
diff --git a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
deleted file mode 100644
index d2e3aeb128a4..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 43b574a667ca..c931e0f70fe1 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,2 +1 @@
-DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
deleted file mode 100644
index 2ae43ed4bf96..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 43b574a667ca..c931e0f70fe1 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,2 +1 @@
-DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
diff --git a/app-crypt/certbot/certbot-1.15.0.ebuild b/app-crypt/certbot/certbot-1.15.0.ebuild
deleted file mode 100644
index e131af1788ec..000000000000
--- a/app-crypt/certbot/certbot-1.15.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 80711fe9de5b..5c51ef3daa25 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/pms/pms-8_p20210613-r1.ebuild b/app-doc/pms/pms-8_p20210613-r1.ebuild
index cc71b23becc6..4b85013d6bc4 100644
--- a/app-doc/pms/pms-8_p20210613-r1.ebuild
+++ b/app-doc/pms/pms-8_p20210613-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="html twoside"
 
 # texlive-bibtexextra for unsrturl.bst
diff --git a/app-doc/pms/pms-8_p20210613.ebuild b/app-doc/pms/pms-8_p20210613.ebuild
deleted file mode 100644
index 4961cf18779d..000000000000
--- a/app-doc/pms/pms-8_p20210613.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Gentoo Package Manager Specification"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="html twoside"
-
-# texlive-bibtexextra for unsrturl.bst
-# texlive-latexextra for chngcntr, gitinfo2, isodate, leaflet, marginnote,
-#   paralist, tocbibind
-# texlive-mathscience for algorithm, algorithmic
-BDEPEND="dev-texlive/texlive-bibtexextra
-	>=dev-texlive/texlive-latexextra-2020-r2
-	dev-texlive/texlive-mathscience
-	virtual/latex-base
-	html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )"
-RDEPEND="!app-doc/pms-bin"
-
-src_compile() {
-	# just in case; we shouldn't be generating any fonts
-	export VARTEXFONTS="${T}/fonts"
-	emake $(usex twoside TWOSIDE=yes "")
-	use html && emake html
-}
-
-src_install() {
-	dodoc pms.pdf eapi-cheatsheet.pdf
-	if use html; then
-		docinto html
-		dodoc *.html pms.css
-		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
-	fi
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f397077fda54..061ff44b8ebc 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild b/app-emulation/cloud-init/cloud-init-20.4.ebuild
index 9ad56e71193d..89910008a34f 100644
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,9 +40,7 @@ DEPEND="
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/contextlib2[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 438857afbaf2..50cd368122db 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -40,9 +40,7 @@ DEPEND="
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/contextlib2[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index a7f5c65396a1..c355c9f901de 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -40,9 +40,7 @@ DEPEND="
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/contextlib2[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.12.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.12.0.ebuild
index 92726b9c7654..7a9c76c9cccd 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.12.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.12.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 726b5dffb9db..6a4c706846cc 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -3,3 +3,4 @@ DIST skopeo-0.2.0.tar.gz 4295805 BLAKE2B 4ad13ff49bec56f3766e8d94f80fe8e22edb011
 DIST skopeo-1.1.0.tar.gz 4516471 BLAKE2B 665acc925cd4f0a97919bbc03db37ca9b5636d110e4780b5053c4a2773b4e524dd879870262f1760aee7413f52c7614cc4adcd56f20881cfe20b2c9a3af09dc3 SHA512 84ce9d786a471cf7d2551ae884801255b0fe501a21d3d2bbbfe0bb9e9c771105b00cdcfc1bef2cee5bd5ce55d0fd30be49c87c09361be47854dbb5e8e20e13a5
 DIST skopeo-1.1.1.tar.gz 4622784 BLAKE2B 3f72a812409a48d960fe36028355cf7128dabbb466bbb20aae9d8dda81a35e018e5a3cf4d430beaf8834f5355d6293a01b7702e88713557afb58216bffd9f3e5 SHA512 7d38179d550a1461f58d2d590d69ea8445d2c1d399a7cf39fcbcf6aab64da056c6de0f772f28eb60aec04c379d2cf27cbc5678546005ea6c1e8c20b7fe5b8676
 DIST skopeo-1.3.0.tar.gz 5593261 BLAKE2B b26e39d821e63b31a1cbd23bf7b836fbe3185f45ad086c8d0f427309590dbaf196fe09af9aca4aae10c30423c3828375ffe6c95c9c9fb1dea739404e98d8554e SHA512 5b6e96fff4670d8dcbc787cd5a568112337a111e7c44111226fa5684edffa880a1d632660238c55b6193ba26496697dd7e38d7d015cdfd61ce5efb119f0e12eb
+DIST skopeo-1.3.1.tar.gz 5595931 BLAKE2B eda2767a1b1b899b99fc70ef361541c388cab77d4521cc2792baf78ca2474e73ff2d7d64d26f713410a40600866fd6c20855d4acdbdb0a31b11d7efaa8101b83 SHA512 65b8ba735bd409b25b56a5538de4e09edfd11d684752a6e9d28037d0f2b80aef80796c2e9588fcf192d24bd885cc7b2d65b0ee7f7c34d18b2eacc25816da5d36
diff --git a/app-emulation/skopeo/skopeo-1.3.1.ebuild b/app-emulation/skopeo/skopeo-1.3.1.ebuild
new file mode 100644
index 000000000000..b18397b2e83c
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-1.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=c35944bec010fe9b534881aca153ef5964f5a010
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs"
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS
+	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
+	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}
diff --git a/app-emulation/virt-what/virt-what-1.21.ebuild b/app-emulation/virt-what/virt-what-1.21.ebuild
index 04e200d15f87..1f1574cf272c 100644
--- a/app-emulation/virt-what/virt-what-1.21.ebuild
+++ b/app-emulation/virt-what/virt-what-1.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE="dmi"
 
 DEPEND="dev-lang/perl"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b93c9a34e436..264202c73ba8 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/piper/piper-0.5.1-r1.ebuild b/app-misc/piper/piper-0.5.1-r2.ebuild
similarity index 96%
rename from app-misc/piper/piper-0.5.1-r1.ebuild
rename to app-misc/piper/piper-0.5.1-r2.ebuild
index 594522ebf5c6..b46057798005 100644
--- a/app-misc/piper/piper-0.5.1-r1.ebuild
+++ b/app-misc/piper/piper-0.5.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit meson python-single-r1 udev
+inherit meson python-single-r1 udev xdg
 
 DESCRIPTION="GTK configuration application for libratbag"
 HOMEPAGE="https://github.com/libratbag/piper"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index a42dbcea5a15..24b3b177b768 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/golop/Manifest b/app-portage/golop/Manifest
index d7113d7b5f97..11720067e48a 100644
--- a/app-portage/golop/Manifest
+++ b/app-portage/golop/Manifest
@@ -1,2 +1 @@
-DIST golop-0.0.1.tar.gz 8316 BLAKE2B a1e51d55ef4744f3a6d00bcba145a410c9f67e78107bb990f6195ec5912d875e31308556e5d1e993917526121857ece09bd894556328e37453ea98d0a306f6d8 SHA512 650ceeb2607871d029f97ced882d661d1045dce6792c2c43f9c79076497a37290bc944f1b619ca133faac73c9fd1a6c35f1f2afd8e84c17ddf37252b66f08650
 DIST golop-0.2.1.tar.gz 9315 BLAKE2B 0b0410910f17121f334c270f71dfb0fb4a1eb909893a241c3bbf1b4473d70be5b1b6d318d61d25e1379e30b8956a0ca37b3cbf2aeb6efcecd6ee14d6c3571c9b SHA512 65a12771784d3676001ed55ac389dfc26f5c2120240a3fbd6efc1954abc19be4d9e1de403dcec1c9de3f3385b2286a6836604fb0ffe9eb071467454bf8c41f56
diff --git a/app-portage/golop/golop-0.0.1-r1.ebuild b/app-portage/golop/golop-0.0.1-r1.ebuild
deleted file mode 100644
index 461b2e016c8d..000000000000
--- a/app-portage/golop/golop-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-EGO_PN=github.com/klausman/golop
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86"
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build prefix
-
-DESCRIPTION="A pure Go re-implementation of genlop"
-HOMEPAGE="https://github.com/klausman/golop"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	sed -i -e 's@/var/log/emerge.log@'"${EPREFIX}"'&@g' src/github.com/klausman/golop/main.go || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-
-	declare -a DOCS
-	DOCS+=( src/${EGO_PN}/README.md )
-	einstalldocs
-}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index b28ccef515af..afa9b9deca28 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,4 +1,3 @@
 DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
-DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
-DIST portage-utils-0.91.tar.xz 1783048 BLAKE2B cb93f29b8f7402b745ca0d191c8c02c75ab6a4a9fbe54b8d1ea60d1a2917a8ba2f6ff88e2c211b957ace1916307c38308ff355c7cd9a8db8876aed8f235a841f SHA512 f10c1653af44e9907bea5245b65127f047f8cd48c30a5d0252f514c759b6fdb83fbf036ba7297c926b6ddd3ca34c231717e78378dfd709fab699012ab5a67450
+DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
diff --git a/app-portage/portage-utils/portage-utils-0.90.1.ebuild b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
deleted file mode 100644
index 2c9445c3d585..000000000000
--- a/app-portage/portage-utils/portage-utils-0.90.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
-else
-	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-RDEPEND="
-	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			app-crypt/libb2:=[static-libs]
-			dev-libs/openssl:0=[static-libs]
-			sys-libs/zlib:=[static-libs]
-			app-crypt/gpgme:=[static-libs]
-		)
-		!static? (
-			app-crypt/libb2:=
-			dev-libs/openssl:0=
-			sys-libs/zlib:=
-			app-crypt/gpgme:=
-		)
-	)
-	qtegrity? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			dev-libs/openssl:0=[static-libs]
-		)
-		!static? (
-			dev-libs/openssl:0=
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
-		$(use_enable openmp) \
-		$(use_enable static)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.91.ebuild b/app-portage/portage-utils/portage-utils-0.92.ebuild
similarity index 100%
rename from app-portage/portage-utils/portage-utils-0.91.ebuild
rename to app-portage/portage-utils/portage-utils-0.92.ebuild
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b30b8aaacf7b..9a4eba3fc20a 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index 841270930708..0984cf5d93e0 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1 +1 @@
-DIST kramdown-rfc2629-1.4.18.gem 47104 BLAKE2B 692071c3182703848a6a6629454e06487919657ec0a0fdf33a7a4ef53421751fad81f67167c33fe0d9a5397bce270c660bf9091862739ecb42dc9adceefb6c50 SHA512 e1bc0537ef936f3519ecbebad055f3cbd136c117a62e84878fdb5a63ad224e2256dfe51285abc84345e6e7322dc3f131c9577d7cf3340c32d224451dec27b323
+DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.18.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
similarity index 100%
rename from app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.18.ebuild
rename to app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0325d5614719..4f22454fe869 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
index 1841cfc7411c..fb6baf38e15a 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
 
 REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index e5710565f5a0..3d246b2c03aa 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc static-libs"
 
 DOCS=( AUTHORS ChangeLog README README.osx TODO )
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index cfae428f3b4f..17578c1fe2e7 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index ff2bca5bfb8c..100db0604af3 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,12 +1,7 @@
-DIST postgresql-10.16.tar.bz2 19140221 BLAKE2B 37fccd3f5c72ac489cbc26225dcc6992fa7fd5884a0141ec093122f556d7959a053181e01c6892d2e322af54028bf40b2293d090afa6366739cdefd3f62abd73 SHA512 690649b4e2f4e0650e5b927048e06894e60c5cf1663bb63ab89143f49e5f753e590d3f011b44df3c402379953a9c23f4832f0cf97c984f03c37d14cb85c860aa
 DIST postgresql-10.17.tar.bz2 19153278 BLAKE2B 0f043a9e95a76b5b96572548b82ae35c0b9fb517214ea392e6ba278f78071811ea8942fd50c14508dc3380c797a2196b5c5cfadff299d6a379ee581db18e3489 SHA512 4989abe56cf631b367252c62f15c9f4a22a864a75d607fa29c2116c95e29f95bc3855df6b2fc88dbedcfc7b238d6732d13629fc967f09bbd3ea4d5c328cb925f
-DIST postgresql-11.11.tar.bz2 20054359 BLAKE2B d15a75319c53fb38a63e4e331567e32014e30fd8696ce19e4c50a458e866827f934d1bc7d28a0c28fddbf1ff7e9f61e5b3016cef27ed988ca43aabb3278bb64d SHA512 8d38e6b7826e73191159f1ee69efde28adc061e0041eb136f55681503a189355b869b2ff312860325d454c1f95367d921fb61dd2de31f584261f165f229bcdb9
 DIST postgresql-11.12.tar.bz2 20075485 BLAKE2B 0986a31662a307f76c230d7945495b42c70417835c8d7c7b6781d0ff4317607c736d9278a4b8bb95582799b771011efca256d9507d5bb9db423f3ad43eb220fb SHA512 668914424e1dbe09a66d5272e5b0a17fa24c90d3d099f8161f1420eaa76675ea1c622e4d149bdfcb31f07af19602a500913cb97c49d717df23e374de09dc0274
-DIST postgresql-12.6.tar.bz2 20771172 BLAKE2B 7df8eb901255f56b4574cdd94a5e9d5a907d800edded805d4e8a9d1b85e5aac1c9b1963c9f8980ff5c95607e046e8e92f35a808f009cfdd36d54e1aca2e35db0 SHA512 5742c9d861c53bbdd032972e63b706d24ccb39492474c446cf4edac235d57357f036e48727027819004177003c4328123148e3d767d2b3d7866a52f333f8d68d
 DIST postgresql-12.7.tar.bz2 20819005 BLAKE2B 4939cb314253bb9ca2b14639f730967ce7ad5c5eb135d529b112290e6b351f7b507d6428cc48b4e24f34f664b5f4938029ceb9cc6161c9aff5f60ba0b3f848c7 SHA512 47ca347df63a441e52e52442074e85d0ebd3a89f7eb037022c4690cbe88b21a6a959092a812b79bb30db47b5975a5d7908318c73b2685683d48b4789d4ae6a44
-DIST postgresql-13.2.tar.bz2 21057276 BLAKE2B 982feffdd98d3f519ff1e790d35ac828710d3ca6cbf935a78bf04011dbc12b4523b451bc7f2421a788a709d1746b2cca9135842bfc1d5048ef5951ed48b20b6a SHA512 6d93cbae8de8637deeccd851fb676a12015e8e1efa6be2424f506f232db535c54b974b11f47ed4578575f90f6de1947b1647f399794b4ec242838efd4c5b2bce
 DIST postgresql-13.3.tar.bz2 21119109 BLAKE2B 395a3dc5cde8f579a3c35ea70346bdc630a8e8f2f86f310a5e4f4a1f6177dab7e78ba6e41c384ba650eb86813fcd428fea8aa22481f9a494cd80aa94bd7b52dd SHA512 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60
 DIST postgresql-14beta2.tar.bz2 22555641 BLAKE2B 50d928c26d679789cda82b074150b78707adb8204fcc02392a027d8b71a61a2dc80042d9f9b68eee9a36f7991178e5e24f72ba1a931d16fc5d8e81097e2874f2 SHA512 fdda7b4ea178a1c0990952da2caf07186deb2047b292c49549881e34d2e7ebb09014f914632ef3342ab7184614d47320d280cceb6bd85a93f79dfcfa68137eff
 DIST postgresql-9.5.25.tar.bz2 17923796 BLAKE2B 432e035e78dacddddfd46fd4d04775b61e2e4db9e61945fa5f7e1c3c5ea3516a5e327489b4e57313b0d6ba4f2e20f52a164f96db01aa22b755ff625039f262eb SHA512 621b36d767d2c7eb2e942cb7b26ca7491450fcfd9606114849f7336b4d8a0bc0196badb44da4918e748145d21b6f72ccf1255a1309dff2427da8b39b63fca427
-DIST postgresql-9.6.21.tar.bz2 18990266 BLAKE2B 42a2feaf15b8fd4cfcc028a744a696314f0ce7b22ec6c18c43152d7e4b8149a9d5acd6cf22c1d13643709dd2b3f1de571e2925c7fc501dc361248c99c88e3f42 SHA512 6fba42171cbe4ec24ed250c32cc8f35be70ddfbc6d1ef0df733bbd094b29174ef198db351f6679a26170effe1fed44269dbe9dbdd619bb18be87f5b539f74475
 DIST postgresql-9.6.22.tar.bz2 19003741 BLAKE2B adff6e81ec4b289bd5c51fa44adb38d7cc3936e2e5545ff23fccb0f3f1fe1c881ed70f9a0a5d366319f876eb01a9f675b66c9374b8b41615220f45a70450ad6d SHA512 371f85f2d02a8a3b888396440149e9b432f91e106a7feb8a163b275a0586843683124281a0965abf3c1215cb68e2002976913f88c75e35e52ac5f78d4145fd7b
diff --git a/dev-db/postgresql/postgresql-10.16.ebuild b/dev-db/postgresql/postgresql-10.16.ebuild
deleted file mode 100644
index 455e434e709d..000000000000
--- a/dev-db/postgresql/postgresql-10.16.ebuild
+++ /dev/null
@@ -1,458 +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 flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap nls pam perl
-	  python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	# https://bugs.gentoo.org/753257
-	# https://bugs.gentoo.org/766225
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch \
-		   "${FILESDIR}"/postgresql-10.0-icu68-2.patch
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-11.11.ebuild b/dev-db/postgresql/postgresql-11.11.ebuild
deleted file mode 100644
index d9a85a984c3b..000000000000
--- a/dev-db/postgresql/postgresql-11.11.ebuild
+++ /dev/null
@@ -1,455 +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 flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-12.6.ebuild b/dev-db/postgresql/postgresql-12.6.ebuild
deleted file mode 100644
index cc8c01351253..000000000000
--- a/dev-db/postgresql/postgresql-12.6.ebuild
+++ /dev/null
@@ -1,455 +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 flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-13.2.ebuild b/dev-db/postgresql/postgresql-13.2.ebuild
deleted file mode 100644
index 59bc6f2685f5..000000000000
--- a/dev-db/postgresql/postgresql-13.2.ebuild
+++ /dev/null
@@ -1,459 +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 flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.6.21.ebuild b/dev-db/postgresql/postgresql-9.6.21.ebuild
deleted file mode 100644
index e6c0c5e5df53..000000000000
--- a/dev-db/postgresql/postgresql-9.6.21.ebuild
+++ /dev/null
@@ -1,478 +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 flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1-2)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc kerberos kernel_linux ldap nls pam perl
-	  pg-legacytimestamp python +readline selinux +server systemd ssl
-	  static-libs tcl threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-${SLOT}.3-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable !pg-legacytimestamp integer-datetimes) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		# Temporarily tack on tmp to workaround a file collision
-		# issue. This is only necessary for 9.7 and earlier. 10 never
-		# had this issue.
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}tmp"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
-	# /usr/bin/psql96). They may have been created by the
-	# postgresql.eselect module, but they're handled within this ebuild
-	# now. It's alright if we momentarily delete /usr/bin/psql as it
-	# will be recreated by the eselect module in pkg_ppostinst(). This
-	# is only necessary for 9.7 and earlier. 10 and later were never
-	# handled in this manner.
-	local canonicalise
-	if type -p realpath > /dev/null; then
-		canonicalise=realpath
-	elif type -p readlink > /dev/null; then
-		canonicalise='readlink -f'
-	else
-		# can't die, subshell
-		die "No readlink nor realpath found, cannot canonicalise"
-	fi
-
-	local l
-	# First remove any symlinks in /usr/bin that may have been created
-	# by the old eselect
-	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
-		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
-			rm "${l}" || ewarn "Couldn't remove ${l}"
-		fi
-	done
-
-	# Then move the symlinks created by the ebuild to their proper place.
-	for l in "${ED}"/usr/bin/*tmp ; do
-		mv "${l}" "${l%tmp}" \
-			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
-	done
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/redis/redis-6.2.4.ebuild b/dev-db/redis/redis-6.2.4.ebuild
index 6e809cd687a6..3402d1614c7d 100644
--- a/dev-db/redis/redis-6.2.4.ebuild
+++ b/dev-db/redis/redis-6.2.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 105fe4a2b1b3..bab9b7bf273f 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index fec5d60f9a41..e1fa24fe8bb1 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,2 +1,3 @@
 DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
+DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
 DIST gradle-bin-7.1.zip 154782196 BLAKE2B 8252b53dd9214f92c2a900a240ee22e1cf98f8dadc07248df8015dd3eda745338198b864aeb1cd0d3b3ec4604fdf01105c74e95fba4b9dde1ef56db7eb5f8dcd SHA512 30aad03b1bd02fef13fbb59ae29ce859dc60f734432207c9a173056bc9e23125233d618c3f4906011f70065dd09c848abdc6dd249421c3b79c28477903b78a01
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
new file mode 100644
index 000000000000..dfbd1549205b
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 62e1860557ed..ec7da9064eb4 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,5 +1,6 @@
 DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
 DIST apache-tomcat-10.0.7-src.tar.gz 6001147 BLAKE2B f1aee4748d404d02188369603824dcc97765e907cfc3872f54b1859ae950a9475d72862caa2179ac39e4cbdb8c23424f89c4cbbfff8a2e079a842b0054257009 SHA512 395b0280666c6779f6378cb87e9abdb637a823e7f89452b7324329f4c0a1fe0b315275dca5df2f80a38c6f1ef98541bd1ea762df7af9cb15e4466c3b89e4e7a8
+DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
@@ -8,3 +9,4 @@ DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1d
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
+DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild
new file mode 100644
index 000000000000..fb739b89bf7a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild
new file mode 100644
index 000000000000..4a8d22d12869
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d773fabc0a81..570c556076f2 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
index 7e13c7a44ee7..03f52674cd08 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+daemon elibc_musl pam static-libs test +tools"
 REQUIRED_USE="daemon? ( tools )"
 
diff --git a/dev-libs/libedit/libedit-20210419.3.1.ebuild b/dev-libs/libedit/libedit-20210419.3.1.ebuild
index 8556afdaf730..f6030f3568ab 100644
--- a/dev-libs/libedit/libedit-20210419.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20210419.3.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libfmt/libfmt-7.1.3.ebuild b/dev-libs/libfmt/libfmt-7.1.3.ebuild
index da84550b5591..c307ccb4ff76 100644
--- a/dev-libs/libfmt/libfmt-7.1.3.ebuild
+++ b/dev-libs/libfmt/libfmt-7.1.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libretls/libretls-3.3.3.ebuild b/dev-libs/libretls/libretls-3.3.3.ebuild
index 4f9e2ed51ec5..abfa537f5063 100644
--- a/dev-libs/libretls/libretls-3.3.3.ebuild
+++ b/dev-libs/libretls/libretls-3.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index 3384710de4a5..a79d450f6776 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -1 +1,2 @@
 DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
+DIST log4cplus-2.0.6.tar.bz2 1197177 BLAKE2B cb2d4635b109690a81f2e228d48424a67addfccec6f5c6a1ef0e91b8f4ee24d41ba690e812d812a157688e2399ffefc0574111b7c6b38ce3551c11632acf76e9 SHA512 9dbbcff18fb50e7dd1a43076deb1be7d00343fc7ba590ef45a8098b544cb8421262f21fb9f319a570adac59b93960fceb2748e04902a39a8a90903b650de8cfd
diff --git a/dev-libs/log4cplus/log4cplus-2.0.6.ebuild b/dev-libs/log4cplus/log4cplus-2.0.6.ebuild
new file mode 100644
index 000000000000..f299c1896cee
--- /dev/null
+++ b/dev-libs/log4cplus/log4cplus-2.0.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
+HOMEPAGE="http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="explicit-initialization iconv qt5 server test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	qt5? ( dev-qt/qtcore:5 )"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOG4CPLUS_BUILD_LOGGINGSERVER=$(usex server)
+		-DWITH_UNIT_TESTS=$(usex test)
+		-DLOG4CPLUS_BUILD_TESTING=$(usex test)
+		-DLOG4CPLUS_ENABLE_THREAD_POOL=$(usex threads)
+		-DLOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION=$(usex explicit-initialization)
+		-DWITH_ICONV=$(usex iconv)
+		-DLOG4CPLUS_QT5=$(usex qt5)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/log4cplus/metadata.xml b/dev-libs/log4cplus/metadata.xml
index ccbce42becd1..3505ffac3823 100644
--- a/dev-libs/log4cplus/metadata.xml
+++ b/dev-libs/log4cplus/metadata.xml
@@ -3,11 +3,17 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
+		<flag name="explicit-initialization">Require explicit initialization</flag>
+		<flag name="iconv">Use inconv for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
+		<flag name="server">Build the logging server</flag>
 		<flag name="working-locale">Use C++'s std::locale for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
 		<flag name="working-c-locale">Use the C99 locale facilities for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation </flag>
-		<flag name="iconv">Use inconv for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
 	</use>
+	<slots>
+		<subslots>soname major version number</subslots>
+	</slots>
 	<upstream>
+		<bugs-to>https://github.com/log4cplus/log4cplus/issues</bugs-to>
 		<remote-id type="github">log4cplus/log4cplus</remote-id>
 		<remote-id type="sourceforge">log4cplus</remote-id>
 	</upstream>
diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
index e88b52bf1197..c862468d3377 100644
--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/re2-0.2021.06.01.ebuild b/dev-libs/re2/re2-0.2021.06.01.ebuild
index 79f4fce02bfe..d3c96b29a6d4 100644
--- a/dev-libs/re2/re2-0.2021.06.01.ebuild
+++ b/dev-libs/re2/re2-0.2021.06.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index 47c0af16df64..f3c3ce1a75bf 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 2a78a7a2cf4f..db7c81c631f4 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..3fc4ee845be9
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1_rc4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 29cbb152037b..89a09addc802 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1 +1,2 @@
 DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
+DIST uutf-1.0.2.tbz 22420 BLAKE2B 8391f6c3cde40db3fa86b9243d8ea8fb52409aa958d1020f302d602bf7c06c44b7d93f7a6a64a1b0964c7bb5856e15178957bba48102dbd36d8efe9581db3787 SHA512 5f2dbe78eaf73a292438d84c7185c839a7ac13cee9616a7b5006990314c6a0d42b212854cc2e89d815d3c45804f94bb40af75ecb60da7092887d8dc21e968bdd
diff --git a/dev-ml/uutf/uutf-1.0.2.ebuild b/dev-ml/uutf/uutf-1.0.2.ebuild
new file mode 100644
index 000000000000..320c6dea77ec
--- /dev/null
+++ b/dev-ml/uutf/uutf-1.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Non-blocking streaming Unicode codec for OCaml"
+HOMEPAGE="https://erratique.ch/software/uutf"
+SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc utftrip +ocamlopt test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="utftrip? ( ocamlopt )"
+
+RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/uchar:=
+	utftrip? ( dev-ml/cmdliner:= )"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
+	dev-ml/topkg
+	test? ( dev-ml/cmdliner )"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-cmdliner "$(usex utftrip true false)" \
+		|| die
+}
+
+src_test() {
+	if use ocamlopt ; then
+		ocamlbuild -use-ocamlfind tests.otarget || die
+		pushd _build/test || die
+		./test.native || die
+		# Rebuild to avoid mismatches between installed files, bug #604674
+		popd || die
+		ocaml pkg/pkg.ml build \
+			--with-cmdliner "$(usex utftrip true false)" \
+			|| die
+	else
+		ewarn "Sorry, ${PN} tests require native support (ocamlopt)"
+	fi
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+	local nativelibs=""
+
+	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
+	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
+
+	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+	dodoc CHANGES.md README.md
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/*
+	fi
+}
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.5.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.5.0.ebuild
index 195370a4b24c..f7f2b4589a0c 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.5.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.5.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.290.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.290.0.ebuild
index 3a15dc8fab8a..e5ef088aa9a6 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.290.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.290.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index b1be514f3387..ed7485629e0a 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index be196c4291bd..7dd64e7cb72c 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/asttokens/asttokens-2.0.5.ebuild b/dev-python/asttokens/asttokens-2.0.5.ebuild
index cf7fc5d2a259..393339cec50b 100644
--- a/dev-python/asttokens/asttokens-2.0.5.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Annotate Python AST trees with source text and token information"
@@ -29,3 +29,12 @@ BDEPEND="
 distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.8 ]] && deselect+=(
+		tests/test_astroid.py::TestAstroid::test_slices
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/cbor2/cbor2-5.4.0.ebuild b/dev-python/cbor2/cbor2-5.4.0.ebuild
index 1654cebdaf94..adb6dd1b4bd2 100644
--- a/dev-python/cbor2/cbor2-5.4.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/dev-python/clang-python/clang-python-12.0.1_rc4.ebuild b/dev-python/clang-python/clang-python-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-12.0.1_rc4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/distlib/distlib-0.3.2.ebuild b/dev-python/distlib/distlib-0.3.2.ebuild
index 36e8bd9017eb..66ab6cdcfcf1 100644
--- a/dev-python/distlib/distlib-0.3.2.ebuild
+++ b/dev-python/distlib/distlib-0.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 8139cb288d6b..66c1a82b4971 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1 +1,2 @@
 DIST django-taggit-1.3.0.tar.gz 46986 BLAKE2B ebe425bc17b67977d40c56b9072ef471e1239090056667f1a5792f005908cbffc31f9eb863575ff7d3d359ebef7263e085bad5b7b481ed9060720bd59f617bb3 SHA512 bd5a537fc11bc4b434a5dbbc11e583acb3878101fcfa7e24af3aca5f160e2f1ac8defc9454c0814d39eb47bbb8edea8d3cf47627ad4b4dc86b962cd69d415ccd
+DIST django-taggit-1.5.1.tar.gz 52766 BLAKE2B 59892ba591ad5cbc40a7515a6427722d7cb58e2daadec579b1c08dcc3522e24e041cbe06c953c3717cdf3db50aef7ff9fb5b4eac00344e457b61797745638107 SHA512 8e7afefd8f0654340e234f7bd1cc3684b3e5d1f4d94d17c79ed8fb82096c21a809e7f8db2fea9509d45c3f2bdc5e8ed52fb0823779b0a039f87528642803725b
diff --git a/dev-python/django-taggit/django-taggit-1.5.1.ebuild b/dev-python/django-taggit/django-taggit-1.5.1.ebuild
new file mode 100644
index 000000000000..27e3b3afdeea
--- /dev/null
+++ b/dev-python/django-taggit/django-taggit-1.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Simple tagging for Django"
+HOMEPAGE="https://github.com/jazzband/django-taggit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/djangorestframework[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	"${EPYTHON}" -m django test -v 2 --settings=tests.settings ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-taggit/metadata.xml b/dev-python/django-taggit/metadata.xml
index 4514a512c9dc..a75c4a522006 100644
--- a/dev-python/django-taggit/metadata.xml
+++ b/dev-python/django-taggit/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-taggit</remote-id>
 	</upstream>
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 1439d278479e..54651edfaafe 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1 +1,2 @@
 DIST executing-0.6.0.gh.tar.gz 330731 BLAKE2B f6a86072907c5140aefb45beb46bcc8c6e3e242e2e821046e59f0eafe1d5c16efe3c08dd1b19b1ce85388fd9cc4757bfe586b95fb490a594cfee4f5e69b5a0af SHA512 5d2f621ff4cbfd55ac43b555f771b129ade5d20f882f4e5d6a060a1a099abad73cc4128c9e6bd32fccc40c4c85c51c28b3be40ab16f163e1ceaaad07f1936ab7
+DIST executing-0.7.0.gh.tar.gz 452550 BLAKE2B 9b3bdb49b3b00ca17952db747d3f0f3995e8dffbc170bcb2260e7c34ce9e6b0c8e1620be2e2776445a6114add4e2437eaeae8a308391e2c121b6484b5bc6056c SHA512 08ee347f0bcaf04ca2c6010762a6d2d5b054b3590029c55d18d6efae5a5db7c6c5a0948cce9d9684e4bfbfd9ea19326e4ac2c96be40535c0500c28c28ce81e07
diff --git a/dev-python/executing/executing-0.7.0.ebuild b/dev-python/executing/executing-0.7.0.ebuild
new file mode 100644
index 000000000000..fc9d9501f8e0
--- /dev/null
+++ b/dev-python/executing/executing-0.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
diff --git a/dev-python/fonttools/fonttools-4.24.4-r1.ebuild b/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
index cf09489b2b78..083714fbfeab 100644
--- a/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
+++ b/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
index 42df930fda53..ab48455e035f 100644
--- a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/kombu/kombu-5.0.1.ebuild b/dev-python/kombu/kombu-5.0.1.ebuild
index 25a13582c429..189ab9bc017a 100644
--- a/dev-python/kombu/kombu-5.0.1.ebuild
+++ b/dev-python/kombu/kombu-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
 		<=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/dev-python/lit/lit-12.0.1_rc4.ebuild b/dev-python/lit/lit-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..37168fbde9bd
--- /dev/null
+++ b/dev-python/lit/lit-12.0.1_rc4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index 2fcf5b51dccc..472779e6b05f 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -25,9 +25,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/sphinx \
-	dev-python/sphinx_rtd_theme
 
 python_test() {
 	"${PYTHON}" -m unittest discover tests -v || die "tests fail with ${EPYTHON}"
diff --git a/dev-python/netifaces/netifaces-0.11.0.ebuild b/dev-python/netifaces/netifaces-0.11.0.ebuild
index 0521dcdcb3ca..c9b1511ff72b 100644
--- a/dev-python/netifaces/netifaces-0.11.0.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index 076632748580..1d68a8d37f79 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
 			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-		' python3_{6,7,8})
+		' python3_8)
 	)
 	pandas? (
 		$(python_gen_cond_dep '
diff --git a/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
index 79ee5b7012e0..3d9369545d71 100644
--- a/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pydot/pydot-1.4.2.ebuild b/dev-python/pydot/pydot-1.4.2.ebuild
index 74974f560a28..32771d419cfa 100644
--- a/dev-python/pydot/pydot-1.4.2.ebuild
+++ b/dev-python/pydot/pydot-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index c6edc69e84e0..20597c1fe1ec 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,3 +1 @@
-DIST pygobject-3.38.0.tar.xz 553892 BLAKE2B d6add416c3f87ee9d5a56f30dbcaa599682ec5932b204f7c743d50475503ea2705e7943e6a93610d6f1c9d322723d1df6ea0f19c1cf245b2ca7d49395ca36170 SHA512 d63313dea2c143cf8c08a4678f1aa8e5908d503ad29c596eeb9fa1070e1231de57cf934c33031f9c4920b85e391f3b4143b46491ffd16e04e8d48871cb05e5df
-DIST pygobject-3.40.0.tar.xz 555920 BLAKE2B e7b3fa926066ddc6992c3087a582e25207ffb34f5c847be705953d8498f307661822462ceaa6362d120e96556a50882ed78540fce5cd2e97f0a4fd11232fe01c SHA512 c0c617e5678f942db33bdff6e149e438bd7d5f4e0a4e0a112476515d1face1c6e992457f998a5077a08bdacc1bda24711b29a4312bd3ee825b526d54a7ca3db7
 DIST pygobject-3.40.1.tar.xz 556104 BLAKE2B e6a092bee68121d9ef82f41f21c9811f384b8578c48de445f707f1b0de124cf38d899d34b8f4269a154ebd4e323afdfa7afef5c0c5cc5dc451b2cd68b30da04b SHA512 a8350f43ea99c93aa66a23102d4ee2ca3c7f8ec2c8bcf5cd142dd097b4fb38167f1713efff3584aa323c34656c911fb940e462c83c02b107e4aad93d005022f7
diff --git a/dev-python/pygobject/pygobject-3.38.0.ebuild b/dev-python/pygobject/pygobject-3.38.0.ebuild
deleted file mode 100644
index 1e9a11a47540..000000000000
--- a/dev-python/pygobject/pygobject-3.38.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.40.0.ebuild b/dev-python/pygobject/pygobject-3.40.0.ebuild
deleted file mode 100644
index 8e08699fd4ce..000000000000
--- a/dev-python/pygobject/pygobject-3.40.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.40.1-r1.ebuild b/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
index 01f7b7055ebd..7f4753cd2fff 100644
--- a/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.40.1.ebuild b/dev-python/pygobject/pygobject-3.40.1.ebuild
deleted file mode 100644
index a4e9a735cbbd..000000000000
--- a/dev-python/pygobject/pygobject-3.40.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pymetar/pymetar-1.1-r1.ebuild b/dev-python/pymetar/pymetar-1.1-r1.ebuild
index 3c59ec92ebee..79f2ccd209d8 100644
--- a/dev-python/pymetar/pymetar-1.1-r1.ebuild
+++ b/dev-python/pymetar/pymetar-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
 SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pymetar/pymetar-1.2-r1.ebuild b/dev-python/pymetar/pymetar-1.2-r1.ebuild
index 59f0836e3ad6..4b88c1df080b 100644
--- a/dev-python/pymetar/pymetar-1.2-r1.ebuild
+++ b/dev-python/pymetar/pymetar-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
 SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pymetar/pymetar-1.2.ebuild b/dev-python/pymetar/pymetar-1.2.ebuild
index 04c8e91dd3ee..79f2ccd209d8 100644
--- a/dev-python/pymetar/pymetar-1.2.ebuild
+++ b/dev-python/pymetar/pymetar-1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
 SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
index 54ec37690e72..f060193b83b6 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/pyside2-5.15.1.ebuild b/dev-python/pyside2/pyside2-5.15.1.ebuild
index f8073c8fb904..faca1fb33155 100644
--- a/dev-python/pyside2/pyside2-5.15.1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.1.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
similarity index 82%
rename from dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
rename to dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
index cee304ff4f5f..8ee1fa7aea61 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
@@ -18,7 +17,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
 	dev-python/execnet[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
@@ -34,11 +32,12 @@ BDEPEND="
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests --install setup.py
+distutils_enable_tests --install pytest
 
 python_prepare_all() {
-	# keeps trying to install this in tests
-	sed -i 's:path.py::' setup.py || die
+	# remove unnecessary deps
+	# (contextlib2 is not used in py3)
+	sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
index 5c2de55fbadb..3361d4f9f406 100644
--- a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
@@ -26,7 +26,6 @@ BDEPEND="
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/raet/raet-0.6.8-r1.ebuild b/dev-python/raet/raet-0.6.8-r1.ebuild
index aecc0c927c17..21243a0eb76c 100644
--- a/dev-python/raet/raet-0.6.8-r1.ebuild
+++ b/dev-python/raet/raet-0.6.8-r1.ebuild
@@ -21,7 +21,6 @@ RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 BDEPEND="${RDEPEND}
 	test? (
 		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
 PATCHES=(
diff --git a/dev-python/raet/raet-0.6.8-r2.ebuild b/dev-python/raet/raet-0.6.8-r2.ebuild
index bd9f9feb3a4e..e6a8e72b2ee8 100644
--- a/dev-python/raet/raet-0.6.8-r2.ebuild
+++ b/dev-python/raet/raet-0.6.8-r2.ebuild
@@ -21,7 +21,6 @@ RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 BDEPEND="${RDEPEND}
 	test? (
 		>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
 PATCHES=(
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index f8099073633d..0a51a2e51182 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,2 +1,3 @@
 DIST regex-2021.4.4.tar.gz 693187 BLAKE2B a13a51a883599f726c20cdbf28d5b0f1a53d8f2eec5f4047da0ede2951694507c5065de5a84152510874db087c342d52f19d920a7b72c034325ddc91f5fb75ac SHA512 2eff9867639f16ad7894997f399262d653a9ef0bb4e8d40bd977e5c55625cf57b4bb593f84504009a0b3cd50b3876d1938c71fd733c0ad1a076de32b6b4b33b9
 DIST regex-2021.7.1.tar.gz 693459 BLAKE2B 484259e14af99d911a20835be73686fea621e501756b02e760128b60a52eb62719efaa0b788ca57026dbdc3dfd55aa321a0feb8e73f6b7435f8711cf465ec2f6 SHA512 7b28e24a829b8ac8f43fdfadf012e833c715b9743d1c9a7cd34eea2789ec54df23d651c8a15aabe8c5d69662402f6302cfdeb23287c49d91b4e9fb3b9452ef73
+DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b2046c068f3bf5cae3987bc9bbd51e5cdc442c3e72c6c9c0daeeacd658c56b56754c0f9e83c03816237cc311000 SHA512 0849caaafc669b6dc322dcd4d48962cefbe955c19f9ee3d657b7b8389f77ab2b2e27ec341745dff01a60dd3930904d69015a334ff748de10be2d0b7c421b0967
diff --git a/dev-python/regex/regex-2021.7.6.ebuild b/dev-python/regex/regex-2021.7.6.ebuild
new file mode 100644
index 000000000000..271faa2b4fed
--- /dev/null
+++ b/dev-python/regex/regex-2021.7.6.ebuild
@@ -0,0 +1,29 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/shiboken2/shiboken2-5.15.1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
index d4a9c6996bca..7acae0aa868b 100644
--- a/dev-python/shiboken2/shiboken2-5.15.1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index 384fc0ddd4c3..e7d283d6943a 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Make Sphinx better at documenting Python functions and methods"
@@ -23,7 +22,6 @@ RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/contextlib2[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 )"
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index ad4beecffb57..284468711361 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 
 inherit distutils-r1 multilib-minimal autotools
 
@@ -48,6 +48,10 @@ src_prepare() {
 	sed -i -e 's:test_add_tag:_&:' \
 		python/subunit/tests/test_subunit_tags.py || die
 
+	# eliminate unittest2
+	sed -i -e 's:unittest2 as ::' \
+		python/subunit/tests/test_test_protocol.py || die
+
 	distutils-r1_src_prepare
 	eautoreconf
 	multilib_copy_sources
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
deleted file mode 100644
index 7ac7bd38f4e7..000000000000
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/testtools-2.4.0-py39.patch
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests unittest
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testtools/testtools-2.4.0-r2.ebuild b/dev-python/testtools/testtools-2.4.0-r2.ebuild
index 7f1282058fc0..fdc73ff2db99 100644
--- a/dev-python/testtools/testtools-2.4.0-r2.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
index 94d185d86706..dbf1c8a54b9f 100644
--- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
@@ -40,7 +40,6 @@ RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 
 DEPEND="test? (
 		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 5d471f0ff142..d38a767a08cc 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -40,7 +40,6 @@ RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 
 DEPEND="test? (
 		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1ab31bb4f03c..87946bc3173f 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 32054a65a2c1..71ba79ca9892 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,2 +1,3 @@
 DIST dnsruby-1.61.2.gem 257024 BLAKE2B 9b87f0f7e1d3062d30128b131e0ba5fdf7dee8114e0e86f6d63ca79e15db686b412906b685a7db0571fb5678de5148cdb59c0e67c6402c193e13772645be31ba SHA512 39ba76a0ca5073b5d03172754f99fad31c3a9af9e2856b930364eb2a5859619b56a1adbf5c84ccae085afcfdc2e32ffd67cf2a92a4e6150b3a113a03e5c7503d
 DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
+DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
new file mode 100644
index 000000000000..17cf8f6cfbec
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.1:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index b374a75d4ce1..dca7954e6872 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,2 +1 @@
-DIST em-websocket-0.5.1.tar.gz 27792 BLAKE2B 5aa8b9b9a1bf7066086c3115358a01054dbd24c3b9e7b454210c653aa25face2230e5504e0fc3a13d4770bcfcdf5d792c1914f173ec8d83d1b97ee7c169636af SHA512 ca2b4e2e4be663a5932fe63ed0efab169fbee9aec50f9780c1ee5df0efa300acb58410b97a22d5d10a2cb9195c2a68f6c71bf4e070ee6d915c6abf4015aa5d94
 DIST em-websocket-0.5.2.tar.gz 29367 BLAKE2B 91d41044e20f1f8277527205e3ee6671de2a1fb9b433c18d5b48a166c7cfa53c6553e32b726326f126981f0e014625075bc918b71e00bd8a6919670c370b6cab SHA512 46df705e2af93082884c7ca521df4f6cf33309c441eb3ba96be609b2cf280e3b72c689810d55279db6dbbc178ed843d64ccdaf9d4b39d52ddac7d84956065b06
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild
deleted file mode 100644
index 512289f84e58..000000000000
--- a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine based WebSocket server"
-HOMEPAGE="https://rubygems.org/gems/em-websocket"
-SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/eventmachine-0.12.9
-	=dev-ruby/http_parser_rb-0.6*
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on git
-	sed -i -e '/ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Only run unit tests since we require unpackaged code for the
-	# integration tests.
-	sed -i -e "/^require 'em-\(spec\|http\|websocket-client\)/ s:^:#:" \
-		-e "/^require 'integration/ s:^:#:" spec/helper.rb || die
-	rm -fr spec/integration || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 7f9ae62a88e9..eee6905f1397 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,5 +1,2 @@
 DIST fakefs-0.19.2.tar.gz 53405 BLAKE2B c9841f7f2aee5135d149187d03f7f3034d3c6cbce6d33d3710fcdbd936b4599561c857dfac81f13262da6f067a843d0c3159abca0e8be7f77c95ff20e8bd123a SHA512 e27eedff44c3ff556b0e7a22e434205e54847a6f6b03a8ab7604c2f2e9abf8be7d5b8d29bd51e24cc032dfb3aaf7940060c3dae5532b0921e363d2213b12ed90
-DIST fakefs-0.20.1.tar.gz 53626 BLAKE2B 013f49b57355943eb6624540be93bc069c95409f9e1d49c8cced034656f596ee98fc3ee4dd40cb80383d447164f11242e16a5ffb9b35ba2e28fb136e0f72a09e SHA512 61d83868a0cf4d0abf071fadc9ca21176e3ef8f2ccc781760a8b0b3e55713750d3e952482e90a87e8665163a262e8bdef8e6b2f3c423fabe696d64f356862aa4
-DIST fakefs-1.2.1.tar.gz 54106 BLAKE2B bd1128871a36dcf8f0137c9ee13c581cddf2ace5a2959e863c66e52dc5b682c75e0f4507c7d939f6725bc1b5a8446e1747d188b98b1cf557c0d1fccd1d3c7040 SHA512 e18d9c1c5ac444f2a9db362dac3c4563f27c4f9b6e6870960e85882ab28dadee53bd56f6933f6317d3128a5ad3862980fa9e2a72cbf7352c58c18a6cee68163f
-DIST fakefs-1.2.2.tar.gz 54072 BLAKE2B 6e1865377c6586fb409f6392b0313e750c1810b9479c120622757f711da55644e8224c8245ce0ac187c6d531a80ae54081add5572b5170f367fdf1d58b4df924 SHA512 4bd0995a1dca27a15da49962b0fddc1daf1e11f88767bcc36e57883ec62e4270d5d6873f52d64859301a5f186e467d368fbfbc0dcabfbfe24bfdff6b6a14389d
 DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692
diff --git a/dev-ruby/fakefs/fakefs-0.20.1.ebuild b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
deleted file mode 100644
index 67991e1962b3..000000000000
--- a/dev-ruby/fakefs/fakefs-0.20.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-1.2.1.ebuild b/dev-ruby/fakefs/fakefs-1.2.1.ebuild
deleted file mode 100644
index 6de4026637a9..000000000000
--- a/dev-ruby/fakefs/fakefs-1.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-1.2.2.ebuild b/dev-ruby/fakefs/fakefs-1.2.2.ebuild
deleted file mode 100644
index b438141a820b..000000000000
--- a/dev-ruby/fakefs/fakefs-1.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/maxitest-3.6:1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/globalid/globalid-0.4.2-r1.ebuild b/dev-ruby/globalid/globalid-0.4.2-r1.ebuild
deleted file mode 100644
index 4ecccd164ba0..000000000000
--- a/dev-ruby/globalid/globalid-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-0.4.2.ebuild b/dev-ruby/globalid/globalid-0.4.2.ebuild
deleted file mode 100644
index 72e08acc7fb9..000000000000
--- a/dev-ruby/globalid/globalid-0.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index 1c582fbd0ceb..65e7e23658dc 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,2 +1 @@
-DIST haml-rails-2.0.0.gem 13824 BLAKE2B 4d885be047f972cea11d3c7d0a9e56d557763d5bf3e95e7cefab33a4422ad114f6351db3226cd1d7645082d70f03a9ecbf86d6ef089ac0ab8836b74736d7ecc8 SHA512 47c5adfeb7b24ccf83ada7c2b453696f3544bc2ed4e7de3ae8ab52a64f6b5f3a3cef36f3144600c47b2f647ec42fd40d32651c7cd1b90184b767f81ec33ac855
 DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.0.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.0.ebuild
deleted file mode 100644
index 3cf22ec4b4af..000000000000
--- a/dev-ruby/haml-rails/haml-rails-2.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides Haml generators for Rails 4"
-HOMEPAGE="https://github.com/indirect/haml-rails"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
-	>=dev-ruby/activesupport-5.1:*
-	>=dev-ruby/railties-5.1:*
-	>=dev-ruby/haml-4.0.6:* <dev-ruby/haml-6:*
-	>=dev-ruby/html2haml-1.0.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
index 3cfe4a30206c..1d5e15988629 100644
--- a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
+++ b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
diff --git a/dev-ruby/hashie/hashie-3.6.0.ebuild b/dev-ruby/hashie/hashie-3.6.0.ebuild
index 2e718a17eb12..3225a15fd058 100644
--- a/dev-ruby/hashie/hashie-3.6.0.ebuild
+++ b/dev-ruby/hashie/hashie-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/hipchat/hipchat-1.6.0.ebuild b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
index 0a4ab80daf6d..ab1c1172bf14 100644
--- a/dev-ruby/hipchat/hipchat-1.6.0.ebuild
+++ b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/html2haml/html2haml-2.2.0.ebuild b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
index 3dac0ad3ef2d..6151f4cbc90b 100644
--- a/dev-ruby/html2haml/html2haml-2.2.0.ebuild
+++ b/dev-ruby/html2haml/html2haml-2.2.0.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=6
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild b/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..4e4bcd292cf6
--- /dev/null
+++ b/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+MY_PN=${PN/-/_}
+RUBY_FAKEGEM_EXTENSIONS=(ext/${MY_PN}/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Liquid performance extension in C"
+HOMEPAGE="https://github.com/Shopify/liquid-c"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+
+ruby_add_rdepend ">=dev-ruby/liquid-3.0.0:*"
+
+all_ruby_prepare() {
+	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/simpleidn/Manifest b/dev-ruby/simpleidn/Manifest
new file mode 100644
index 000000000000..afdfc0ee83d1
--- /dev/null
+++ b/dev-ruby/simpleidn/Manifest
@@ -0,0 +1 @@
+DIST simpleidn-0.2.1.tar.gz 204644 BLAKE2B 4c7f82af2ddaa753c8df91f80776b2b00d3a8a8dfda95c9012ebc3e5eea6503fbb0f20a7f79f8c624612e433b0e61cec79bc6a147ef6a04d418cbff72c31c867 SHA512 20a81ea5bca503b167cd2183f762993454a5f7fe082639b70234521f8cb9e4533b1f5f22dfcac18108c90a461185b13fea55f6197ab4c5996116ac359adf5033
diff --git a/dev-ruby/simpleidn/metadata.xml b/dev-ruby/simpleidn/metadata.xml
new file mode 100644
index 000000000000..6668e58af2c4
--- /dev/null
+++ b/dev-ruby/simpleidn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mmriis/simpleidn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
new file mode 100644
index 000000000000..f446bb84e2af
--- /dev/null
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="tables"
+
+RUBY_FAKEGEM_GEMSPEC="simpleidn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows easy conversion from punycode ACE to unicode UTF-8 strings and vice-versa"
+HOMEPAGE="https://github.com/mmriis/simpleidn"
+SRC_URI="https://github.com/mmriis/simpleidn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/unf-0.1.4 =dev-ruby/unf-0.1*"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 987a806b993b..6b2c2439549d 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 05c9f84919f9..9c29dda05d03 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
index 2b34c68d3cb2..9d954cbbcbbb 100644
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/dev-util/lldb/lldb-12.0.1_rc4.ebuild b/dev-util/lldb/lldb-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..283e64ba210c
--- /dev/null
+++ b/dev-util/lldb/lldb-12.0.1_rc4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 6f80cb794114..28cfb0b7ae47 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,2 +1,3 @@
 DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
 DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
+DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild
new file mode 100644
index 000000000000..3dfff3894bf5
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE=libraries needs working stage2 compiler: bug #665512
+IUSE="headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
+	"${FILESDIR}"/${PN}-8.0.0-__rdtsc.patch
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+	# Normally mingw-64 does not use dynamic linker.
+	# But at configure time it uses $LDFLAGS.
+	# When default -Wl,--hash-style=gnu is passed
+	# __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
+	# for target ld and binaries crash at shutdown.
+	filter-ldflags '-Wl,--hash-style=*'
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	local prefix="${EPREFIX}"$(alt_prefix)/usr
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${prefix}" \
+		--libdir="${prefix}"/lib \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 392ca5aa2a40..cf120b85bad9 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/fossil/fossil-2.16.ebuild b/dev-vcs/fossil/fossil-2.16-r1.ebuild
similarity index 94%
rename from dev-vcs/fossil/fossil-2.16.ebuild
rename to dev-vcs/fossil/fossil-2.16-r1.ebuild
index 6020baf1be32..290ea696f82a 100644
--- a/dev-vcs/fossil/fossil-2.16.ebuild
+++ b/dev-vcs/fossil/fossil-2.16-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
+IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
 REQUIRED_USE="ssl? ( !miniz )"
@@ -26,7 +26,7 @@ RDEPEND="
 		dev-libs/libedit
 	)
 	system-sqlite? ( >=dev-db/sqlite-3.35.0:3 )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	tcl? ( dev-lang/tcl:0= )
 "
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 223cc9623c16..94912d81e264 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index 5def86fbef9d..1af7ba3a80be 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Eclass for installing SELinux policy, and optionally
@@ -263,10 +263,15 @@ selinux-policy-2_pkg_postinst() {
 	local COMMAND
 
 	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "strict" ]] && [[ "${MODS}" = "unconfined" ]]; then
-			einfo "Ignoring loading of unconfined module in strict module store.";
-			continue;
+		if [[ "${MODS}" = "unconfined" ]]; then
+			case ${i} in
+			strict|mcs|mls)
+				einfo "Ignoring loading of unconfined module in ${i} module store.";
+				continue
+				;;
+			esac
 		fi
+
 		einfo "Inserting the following modules into the $i module store: ${MODS}"
 
 		cd "${ROOT%/}/usr/share/selinux/${i}" || die "Could not enter /usr/share/selinux/${i}"
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index fda31d708ffd..1b08f8760f32 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild b/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
index 1c78b6b397c9..8e08730283af 100644
--- a/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/chess/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cve-2021-30184.patch  # bug 780855
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 4a4582b0845d..abd8b35b697a 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index ddd2c12b6a49..ebdefbfb3fc0 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1,2 @@
-DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede SHA512 3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9
-DIST dosbox-staging-0.75.2.tar.gz 1816233 BLAKE2B 0cb3224a1fe0e01e5069b78c91191f33b6d84dfb21b00ed8cd832225e68e5f66e841506bc7c887da462727b931a6c72b84dbf5e48e4dde21dbf62ffa3da4edc6 SHA512 2988b2cc44d041193d900efc4c6fa516aca6246e51c1dece9b207bd3549a8c76c5bcb2f3f5a90da6bb2b573663bddd0020274f17130548aef9cef1f4adf79220
 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142 SHA512 8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
+DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6 SHA512 37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
deleted file mode 100644
index afdf9f7951fe..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	opus? ( media-libs/opusfile )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable debug) \
-		$(use_enable !dynrec dynamic-x86) \
-		$(use_enable dynrec) \
-		$(use_enable network) \
-		$(use_enable opengl) \
-		$(use_enable opus opus-cdda)
-}
-
-src_install() {
-	default
-	doicon contrib/icons/${PN}.svg
-	make_desktop_entry dosbox DOSBox-staging ${PN}
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
deleted file mode 100644
index bdedc780583a..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	opus? ( media-libs/opusfile )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-ar.patch
-	"${FILESDIR}"/${P}-pthread.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable debug) \
-		$(use_enable !dynrec dynamic-x86) \
-		$(use_enable dynrec) \
-		$(use_enable network) \
-		$(use_enable opengl) \
-		$(use_enable opus opus-cdda)
-}
-
-src_install() {
-	default
-	doicon -s scalable contrib/icons/${PN}.svg
-	domenu contrib/linux/dosbox-staging.desktop
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
deleted file mode 100644
index 75de6e5a03a1..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	opus? ( media-libs/opusfile )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug || append-cppflags -DNDEBUG
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable debug) \
-		$(use_enable !dynrec dynamic-x86) \
-		$(use_enable dynrec) \
-		$(use_enable network) \
-		$(use_enable opengl) \
-		$(use_enable opus opus-cdda)
-}
-
-src_install() {
-	default
-	doicon -s scalable contrib/icons/${PN}.svg
-	domenu contrib/linux/dosbox-staging.desktop
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild
new file mode 100644
index 000000000000..956b471e6903
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/"
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	debug? ( sys-libs/ncurses:0= )
+	fluidsynth? (
+		media-sound/fluid-soundfont
+		media-sound/fluidsynth
+	)
+	network? ( media-libs/sdl2-net )
+	opengl? ( virtual/opengl )
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,opengl?,video,X]
+	media-libs/opusfile
+	sys-libs/zlib
+	!games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+	default
+
+	# We do not have default.sf2, use actual name from fluid-soundfont
+	sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+		-i src/midi/midi_fluidsynth.cpp || die
+
+	# Disable license and docs install (handled by ebuild)
+	sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use alsa use_alsa)
+		$(meson_use debug)
+		-Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+		$(meson_use fluidsynth use_fluidsynth)
+		$(meson_use mt-32 use_mt32emu)
+		$(meson_use network use_sdl2_net)
+		$(meson_use opengl use_opengl)
+	)
+	meson_src_configure
+}
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
deleted file mode 100644
index fb2c24267f05..000000000000
--- a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur dosbox-staging-0.75.1.orig/configure.ac dosbox-staging-0.75.1/configure.ac
---- dosbox-staging-0.75.1.orig/configure.ac	2020-08-19 10:49:45.000000000 +0200
-+++ dosbox-staging-0.75.1/configure.ac	2020-09-04 23:03:11.375920481 +0200
-@@ -17,6 +17,7 @@
- AC_CONFIG_HEADER(config.h)
- 
- dnl Checks for programs.
-+AM_PROG_AR
- AC_PROG_MAKE_SET
- AC_PROG_CC
- AC_PROG_CPP
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
deleted file mode 100644
index 1aa7de682bd2..000000000000
--- a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dosbox-staging-0.75.1/configure.ac.orig	2020-08-20 14:25:41.295432272 +0200
-+++ dosbox-staging-0.75.1/configure.ac	2020-08-20 14:26:00.614461707 +0200
-@@ -37,7 +37,7 @@
-             :,
- 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
- )
--LIBS="$LIBS $SDL_LIBS"
-+LIBS="$LIBS -lpthread $SDL_LIBS"
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- 
- dnl Checks for header files.
diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml
index f9ff028304d3..7cf856695f3c 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="dynrec">Use recompiling cpu core instead of dynamic x86/x64 specific cpu core</flag>
 		<flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI emulation</flag>
+		<flag name="mt-32">use <pkg>media-sound/munt</pkg> for MT-32 emulation</flag>
 		<flag name="network">Enable networking features (modem, ipx)</flag>
 		<flag name="opus">Support compressed audio tracks (.opus) used with CDROM images</flag>
 	</use>
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 0173502e9f6f..6aaa585f061c 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -8,3 +8,13 @@ DIST ppsspp-1.11.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c6
 DIST ppsspp-1.11.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
 DIST ppsspp-1.11.3-ffmpeg.tar.gz 396041681 BLAKE2B be67e136b232e6937061d1a7cc37a4302786105a27c454422acdfff3905dcfa58c9fcbdcdb4b6642222d57f69f427a6892ac34018bf34e70f3c66e7708cacb63 SHA512 5417476ba2eeaee9c30bee8297b70a5557f9ec10270d301cb2820f4711be24dbadc4c1ca58b0c4bfb588dfd0aa0d63e676c9b890c471b05f2298bfececbac6b4
 DIST ppsspp-1.11.3.tar.gz 30067677 BLAKE2B 7c5456d38c55c6c1d6a873d869c6df4f31d271f3dec75fd0c5b4f1f4db6ad8a22ad456ba183f0df84d8e2d293bef6c454843f8149c186a86fcbee127aeee7d9a SHA512 5890ae34f2aa4125a816a0fade46a7422385a0652ff04470c56fe653e3a2a697d55bc77f1d7d119bdfa8dbad313d6a1de18a03d1960eaaa9e987b5ddcfed2f48
+DIST ppsspp-1.11.3_p20210627-assets_lang.tar.gz 664123 BLAKE2B 8d96634eb3e930f7f97e8ac24d97eba1e2e7fce3a8f4dbe5a8a4c0c0438a24e981769c3638d7e7770eb1a3af2827a3ece0996fdba8cf668d2c058e3d20741e94 SHA512 691cb38c65ca20700dc5b91c0dc02eec1839f153e042c87f8f4fd480e44c823c0ece9f4752f5e597f2aa4b5cfb22aaf49d76ff990eb2dd5231cc4065dd62566d
+DIST ppsspp-1.11.3_p20210627-ext_SPIRV-Cross.tar.gz 1441538 BLAKE2B 011a0bc8fea2a5986b5884f315d877d0de111dbda226cc6aa5eaf11c0b2cb14acfd94c1279fb80f0a48b27d1a2117487f634a0888f7499d733261c0ced94ea89 SHA512 be77131814691dfbe65de3a2d3ea65de98c7169824997056637bbce39485327ff0f64e7eed8588237615948824e1f9dff1d083472b8cbccd3748a52379411e4e
+DIST ppsspp-1.11.3_p20210627-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
+DIST ppsspp-1.11.3_p20210627-ext_discord-rpc.tar.gz 2108078 BLAKE2B e89ee4a196167cabaecfab82d191516eb0cf0fa89e35f95b6d118d5baad25f5d13d9002a8dcfe4aba099af7b9c1eb72835eb3baa9e4deaedd2754e99687b5967 SHA512 06205287addabfb343ccd9af997b693ed221fe564355d3629d4dee6c003e768b3f65f2b34eb04ef29807a15c5fa34b04c664212b7e0d15b09ad9a4e4be10a560
+DIST ppsspp-1.11.3_p20210627-ext_glslang.tar.gz 3300622 BLAKE2B 0f0d8e043662962f13c4277da335def78a88dd1b35ac2e40b0192f0783c43fd97367d63663764591a5b1eef1bc62c681aa54a402e69c36a8dc50b3595e9e8ba9 SHA512 39b7fd1332dc2f6e29c920961e2a48a33cb7fb36753a0ee5ea8897cb2ad11cec67808ec671cd1bdecbb03eb17f4e83a711013bb20a8cc0831879eb9fbe432bcd
+DIST ppsspp-1.11.3_p20210627-ext_miniupnp.tar.gz 449099 BLAKE2B b2bcdee23c817cf309dd9516e32e06f7e1eadc9ae24db3519a2b4e3861417fb79c0708d6d67e8baec3de9e6c5c2bb0a6daff648bf63f7c419192729957e9959c SHA512 f86f558699e75e7f8a58bbb5e94c2a32d703432cef05ffeac0da129113a1fe485cc5ad43b1fcfda11ee1ee398fa434511eccc37633eb5d3dfe8af864097669de
+DIST ppsspp-1.11.3_p20210627-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
+DIST ppsspp-1.11.3_p20210627-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
+DIST ppsspp-1.11.3_p20210627-ext_zstd.tar.gz 1858608 BLAKE2B 8d3f3fd3b4d9cab38c4544b3fe7030bb5589b230433a1e479a18975145b83255d84c029a6eb57b5440acf160cdfc46aad1b25145bea004c22b1999b63fdfa933 SHA512 5db2ebd0cbdd9f2a1485f876eddf45df23dcf41bb9c7bedec865a60cb63eeba4a8ce6968de4598f18fe4368b38fa6333c0c7e4bf8ed4848ac83a8e7783ce47cd
+DIST ppsspp-1.11.3_p20210627.tar.gz 28650800 BLAKE2B f6f0c512451df4fe4c7a10525898aeb698f0a36889f7216d766d62366f5b3f3040cf5e422cbaaab44c638e4f12ce27361b5170caae33578ecd33ac1409fecf3d SHA512 a309e722f5ddfeef9acfa23ff92cda0c37cf21d255f7d2f3546cdccc51502e4ad66274dd02c96b94637a4bada022a604191f92f2edf40cb0bbdbdaf6acd73223
diff --git a/games-emulation/ppsspp/ppsspp-1.11.3_p20210627.ebuild b/games-emulation/ppsspp/ppsspp-1.11.3_p20210627.ebuild
new file mode 100644
index 000000000000..5b55de6b85af
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.11.3_p20210627.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg cmake
+
+MY_COMMIT="ff2a6eeda2d00210f1a1f7bc0ab0ad99e7bc60b6"
+
+DESCRIPTION="A PSP emulator written in C++"
+HOMEPAGE="https://www.ppsspp.org/"
+SRC_URI="
+	https://github.com/hrydgard/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Cross/archive/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+	https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz
+	https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz
+	https://github.com/facebook/zstd/archive/56421f34e4ab5c17cbac0832bd12413e4f27ecf9.tar.gz -> ${P}-ext_zstd.tar.gz
+	https://github.com/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ${P}-ext_miniupnp.tar.gz
+	https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz
+	https://github.com/hrydgard/ppsspp-lang/archive/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ${P}-assets_lang.tar.gz
+	discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ${P}-ext_discord-rpc.tar.gz )
+"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="discord qt5"
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/libzip:=
+	dev-util/glslang:=
+	media-libs/glew:=
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick]
+	media-video/ffmpeg:=
+	sys-libs/zlib:=
+	virtual/opengl
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtmultimedia:5[-gles2-only]
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtwidgets:5[-gles2-only]
+	)
+	!qt5? ( media-libs/libsdl2[opengl,sound,video] )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}" || die
+	local list=(
+		assets_lang
+		ext_SPIRV-Cross
+		ext_armips
+		ext_glslang
+		ext_miniupnp
+		ext_native_tools_prebuilt
+		ext_rapidjson
+		ext_zstd
+	)
+	use discord && list+=( ext_discord-rpc )
+
+	local i
+	for i in "${list[@]}"; do
+		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" ||
+			die "Failed to unpack ${P}-${i}.tar.gz"
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DHEADLESS=false
+		-DUSE_DISCORD=$(usex discord)
+		-DUSE_SYSTEM_FFMPEG=ON
+		-DUSE_SYSTEM_LIBZIP=ON
+		-DUSE_SYSTEM_SNAPPY=ON
+		-DUSING_QT_UI=$(usex qt5)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${BUILD_DIR}/assets"
+
+	local i
+	for i in 16 24 32 48 64 96 128 256 512; do
+		doicon -s ${i} icons/hicolor/${i}x${i}/apps/${PN}.png
+	done
+
+	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))"
+}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 5c98ae5bc092..d6a83bfa3b96 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/draci-historie/Manifest b/games-rpg/draci-historie/Manifest
index 4c4af984c365..9b624994de3f 100644
--- a/games-rpg/draci-historie/Manifest
+++ b/games-rpg/draci-historie/Manifest
@@ -2,3 +2,4 @@ DIST dh-cz-2012.zip 29293879 BLAKE2B 5f8d4199de6f418d041c409bbc25b383021721b062b
 DIST dh-de-2012.zip 3316443 BLAKE2B 99a495be5d2add5e6f375904d249bda06f556e5e8ede4b33348d6ee46778de15b704016f9b498ca5b68ad678b3f2bd572034c37bc7dde2dfcd9d46ef2f4b242a SHA512 088f372e8de59cb52555a70cb7918ec14bb4abbb712a3867b40ce9eef80dc3f03b6c28402b9e0c9ee7e02f1938ee5f140abc02aef801716e38af84d66dafd5aa
 DIST dh-en-2012.zip 3310860 BLAKE2B 22c8dc8102f5f1d984a760d51fd8f7f028cca6a28b1a4e0f459c44eec68255e3ecd526ef80426b57f2137c33f6a5ba0d16b2c760b42a67413c2ffa3cec9ec648 SHA512 a9b5ff15305c961f288fdf915f56ca204a2ebe5370dcf56c20a0057cf721c45445a20479a39fe1f5443e79e7c95bd5771abef2115396c418442d2e5e400ce10a
 DIST dh-pl-2012.zip 36041498 BLAKE2B 29f6daeac610aa83f4df4a7698d19540f7c97d3a019a66078e784492010891860fa6af9b3151457c0aefeeb5eb3f90b8336693a1367b64e97592e017a7e9f247 SHA512 627f85a14362e032e00ed36275df696b6a468965734db7c8bb459d689b548c05033fe387ffee9855a83fe634f14b98a5c5ea51aefdf169c7243e9282fa1c19a5
+DIST draci-historie.png 5121 BLAKE2B f4f5ec74e00385e1cd13ba4002305960513d5be829a89f116e0ce7829347b934ab2317a5064c6bfeb89e70a6d0f3f6106eb497bf3558e6549f838b2548693512 SHA512 a0c204dcc94c0fe872dd46da7553aa148e08ac5a04941a24eee05823ae1e14ea6576b22e2bae87371d8af3c1559edf14abbd5998784a49338ccba1e217400f30
diff --git a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
index 3982a8538d15..262964dad79f 100644
--- a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
+++ b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
@@ -1,79 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 DESCRIPTION="Bert the little dragon searches for his father"
-HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html"
-BASE_URL="http://www.ucw.cz/draci-historie/binary/dh"
+HOMEPAGE="https://www.ucw.cz/draci-historie/index-en.html"
+BASE_URL="https://www.ucw.cz/draci-historie/binary/dh"
 SRC_URI="
 	l10n_cs? ( ${BASE_URL}-cz-${PV}.zip )
 	l10n_de? ( ${BASE_URL}-de-${PV}.zip )
 	l10n_en? ( ${BASE_URL}-en-${PV}.zip )
 	l10n_pl? ( ${BASE_URL}-pl-${PV}.zip )
 	!l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) )
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png
 "
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="l10n_cs l10n_de l10n_en l10n_pl"
+IUSE="l10n_cs l10n_de +l10n_en l10n_pl"
 
-RDEPEND=">=games-engines/scummvm-1.1"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		mkdir en || die
-		unpack dh-en-${PV}.zip
-		mv *.{dfw,fon,mid,sam} en/ || die
-	fi
-	if use l10n_cs ; then
-		mkdir cs || die
-		unpack dh-cz-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} cs/ || die
-	fi
-	if use l10n_de ; then
-		mkdir de || die
-		unpack dh-de-${PV}.zip
-		mv *.{dfw,fon,mid,sam} de/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir pl || die
-		unpack dh-pl-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -f *.{bat,exe,ins} readme.* || die
+	MY_L10N=( $(usev l10n_{cs,cz}) $(usev l10n_de) $(usev l10n_en) $(usev l10n_pl) )
+	[[ ${MY_L10N} ]] || MY_L10N=( l10n_en )
+
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		mkdir ${lang} || die
+		unpack dh-${lang}-${PV}.zip
+		mv *.{dfw,fon,mid,sam} ${lang}/ || die
+	done
 }
 
 src_install() {
-	newicon bert.ico draci-historie.ico
 	insinto /usr/share/${PN}
-	for lingua in $(find * -type d); do
-		doins -r ${lingua}
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		doins -r ${lang}
+		make_wrapper ${PN}-${lang} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/${lang}\" draci"
+		make_desktop_entry ${PN}-${lang} "Dračí Historie (${lang})"
 	done
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		make_wrapper draci-historie-en "scummvm -f -p \"/usr/share/${PN}/en\" draci" .
-		make_desktop_entry ${PN}-en "Dračí Historie (English)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_cs ; then
-		make_wrapper draci-historie-cs "scummvm -f -p \"/usr/share/${PN}/cs\" draci" .
-		make_desktop_entry ${PN}-cs "Dračí Historie (Čeština)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_de ; then
-		make_wrapper draci-historie-de "scummvm -f -p \"/usr/share/${PN}/de\" draci" .
-		make_desktop_entry ${PN}-de "Dračí Historie (Deutsch)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_pl ; then
-		make_wrapper draci-historie-pl "scummvm -f -p \"/usr/share/${PN}/pl\" draci" .
-		make_desktop_entry ${PN}-pl "Dračí Historie (Polski)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
 }
diff --git a/games-rpg/drascula/Manifest b/games-rpg/drascula/Manifest
index a11c32cbc841..8a5cb59d77d2 100644
--- a/games-rpg/drascula/Manifest
+++ b/games-rpg/drascula/Manifest
@@ -1,5 +1,5 @@
 DIST drascula-1.0.zip 32842993 BLAKE2B 5033e8e5f66f74c2b049a1246c62dd33b7b32c3d088575a8d031bc505cd3356c0b364efa9308c99e26e524dc58913cad7cc09424ac6ad30fff38175f952a0151 SHA512 74ca773264e1ed611456b230d6265dade8d745a3adb736f3d6583d43ed6820a25f481ec65612b31d4b3076418f6bc696c82fa0f5085ec43edc91761e95361d11
-DIST drascula-2.0.0.dat 219527 BLAKE2B 362cb71aa5c7ec7a391a9e371f7adbfeef7c3d015db562e613ebc5513d0d8661af6880549424c9fff0dde25e8fe3a82bc4658e0bd47eb6b65c071fff0dce9983 SHA512 b57cdde7f686d54b3dd669dc5737e0046c3f38a31c4f78cde1b51dc7dc3a28193a95d5364629716998f958b7c43ed45bdcd0bc32f94ca718e7882d16fea2c015
+DIST drascula-2.2.0.dat 259619 BLAKE2B 924dbd42276feef2ef3be599f37316687f1bc4940189082408c5e5eb923d1df2d638a87e4fdf88d443151ec4e4bb4f9c211905c9596b6608691aa40cef1b99b1 SHA512 032731a30561f1c77f2b9f93e80350371afa7673b1140b5a854ceac724c6ed89755af780e9519717f9ac75e7d34a225e03e0d84ebfb5986f6a6cdef0ca018745
 DIST drascula-audio-2.0.zip 36531704 BLAKE2B c3426f9c10e1ab5931b6474c1ba5b13a38267db5c8a8b8663e6a9bbea95751d50f4829dc427d962110ec4b0b093f2c5b59a73ca15aedd73c9ceaf1b3b158ec82 SHA512 09018bcfa062e720db6af7b38fa582f1b3674a25e7bb323d894ad767f8bcd449739fc592a10d848f6cac90a8bb51b5148c5c39558f70d29e2a5116b0b196274e
 DIST drascula-int-1.1.zip 34855203 BLAKE2B b37f6ed68d3ef6cc70915d68178a0359ae39e9d2a020f84573e8e905ec4fa946ad9328479590d5510f0b03ec5a422a4204ffd3fb6294711ea7b68f0f19899151 SHA512 f8127d09e19dec9abf75b9129792c67f3d36ea80fa69c70eeaa536f7a76f8f29072c21f041a0f9467d595f214392541c09c7a75caca0318e8d1b587db9d099cf
 DIST drascula.png 34525 BLAKE2B 1d529b02f08079921ab1021a3012fbef89fd4e9e4933727cdf96c5ce52bc3837d3f636e7b32f33cb92d027cbc330d4fc9280202a6b970821741eb8a44a905346 SHA512 e49fc17cad986b8fa42bd5ede30a1b1ef264182a476168d5c197a31d484555552e824f103b9456898940c68c2f0d751f4c2782a7a95ea92c62e3daec1dd1f52a
diff --git a/games-rpg/drascula/drascula-1.0-r3.ebuild b/games-rpg/drascula/drascula-1.0-r4.ebuild
similarity index 64%
rename from games-rpg/drascula/drascula-1.0-r3.ebuild
rename to games-rpg/drascula/drascula-1.0-r4.ebuild
index f058ca3b8da3..e88289450b68 100644
--- a/games-rpg/drascula/drascula-1.0-r3.ebuild
+++ b/games-rpg/drascula/drascula-1.0-r4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 INT_PV="1.1"
 INT_URI="mirror://sourceforge/scummvm/drascula-int-${INT_PV}.zip"
-DAT_PV="2.0.0"
+DAT_PV="2.2.0"
 AUD_PV="2.0"
 
 DESCRIPTION="Drascula: The Vampire Strikes Back"
@@ -19,6 +20,7 @@ SRC_URI="mirror://sourceforge/scummvm/drascula-${PV}.zip
 	l10n_de? ( ${INT_URI} )
 	l10n_fr? ( ${INT_URI} )
 	l10n_it? ( ${INT_URI} )"
+S="${WORKDIR}"
 
 LICENSE="drascula"
 SLOT="0"
@@ -26,12 +28,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="l10n_es l10n_de l10n_fr l10n_it +sound"
 RESTRICT="mirror"
 
-RDEPEND=">=games-engines/scummvm-0.13.1"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm[vorbis]"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
 	if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then
@@ -44,22 +42,27 @@ src_unpack() {
 }
 
 src_install() {
-	local lang
-
-	make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" drascula" .
-	for lang in es de fr it; do
-		if use l10n_${lang} ; then
-			make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"/usr/share/${PN}\" drascula" .
-			make_desktop_entry ${PN}-${lang} "Drascula: The Vampire Strikes Back (${lang})" ${PN}
-		fi
-	done
 	insinto /usr/share/${PN}
-	find . -name "P*.*" -execdir doins '{}' +
 	newins "${DISTDIR}"/drascula-${DAT_PV}.dat drascula.dat
-	if use sound; then
-		doins audio/*
+	doins Packet.001
+
+	if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then
+		doins ${PN}-int-${INT_PV}/PACKET.00[2-5]
+
+		local lang
+		for lang in es de fr it; do
+			if use l10n_${lang}; then
+				make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"${EPREFIX}/usr/share/${PN}\" drascula"
+				make_desktop_entry ${PN}-${lang} "Drascula (${lang})"
+			fi
+		done
 	fi
-	dodoc readme.txt drascula.doc
+
 	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Drascula: The Vampire Strikes Back"
+	make_wrapper ${PN} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}\" drascula"
+	make_desktop_entry ${PN} Drascula
+
+	use sound && doins -r audio/.
+
+	dodoc readme.txt drascula.doc
 }
diff --git a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
index b041a158412f..8e0173c49eac 100644
--- a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
+++ b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city"
 HOMEPAGE="https://wiki.scummvm.org/index.php/Dreamweb"
@@ -16,51 +17,30 @@ SRC_URI="doc? ( mirror://sourceforge/scummvm/${PN}-manuals-en-highres.zip )
 	!l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? \
 		( mirror://sourceforge/scummvm/${PN}-cd-us-${PV}.zip ) ) ) ) ) )
 	http://www.scummvm.org/images/cat-dreamweb.png"
+S="${WORKDIR}"
 
 LICENSE="Dreamweb"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
+IUSE="doc l10n_de +l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
 
-RDEPEND=">=games-engines/scummvm-1.7[flac]"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm[flac]"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	if use l10n_de ; then
-		mkdir -p "${S}"/de || die
-		cd "${S}"/de || die
-		unpack ${PN}-cd-de-${PV}.zip
-	fi
-	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
-			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
-		mkdir -p "${S}"/en_US || die
-		cd "${S}"/en_US || die
-		unpack ${PN}-cd-us-${PV}.zip
-	fi
-	if use l10n_en-GB ; then
-		mkdir -p "${S}"/en_GB || die
-		cd "${S}"/en_GB || die
-		unpack ${PN}-cd-uk-${PV}.zip
-	fi
-	if use l10n_es ; then
-		mkdir -p "${S}"/es || die
-		cd "${S}"/es || die
-		unpack ${PN}-cd-es-${PV}.zip
-	fi
-	if use l10n_fr ; then
-		mkdir -p "${S}"/fr || die
-		cd "${S}"/fr || die
-		unpack ${PN}-cd-fr-${PV}.zip
-	fi
-	if use l10n_it ; then
-		mkdir -p "${S}"/it || die
-		cd "${S}"/it || die
-		unpack ${PN}-cd-it-${PV}.zip
-	fi
-	if use doc ; then
-		mkdir -p "${S}"/doc || die
+	MY_L10N=( $(usev l10n_de) $(usev l10n_es) $(usev l10n_fr) $(usev l10n_it) )
+	MY_L10N+=( $(usev l10n_{en,us}) $(usev l10n_{en-GB,uk}) )
+	[[ ${MY_L10N} ]] || MY_L10N=( l10n_us )
+
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		mkdir "${S}"/${lang} || die
+		cd "${S}"/${lang} || die
+		unpack ${PN}-cd-${lang}-${PV}.zip
+	done
+
+	if use doc; then
+		mkdir "${S}"/doc || die
 		cd "${S}"/doc || die
 		unpack ${PN}-manuals-en-highres.zip
 	fi
@@ -68,42 +48,18 @@ src_unpack() {
 
 src_prepare() {
 	default
-	rm -rf */license.txt */*.EXE || die
+	rm -f */license.txt */*.EXE || die
 }
 
 src_install() {
 	insinto /usr/share/${PN}
-	newicon "${DISTDIR}"/cat-dreamweb.png dreamweb.png
-	if use l10n_de ; then
-		doins -r de
-		make_wrapper dreamweb-de "scummvm -f -p \"/usr/share/${PN}/de\" dreamweb" .
-		make_desktop_entry ${PN}-de "Dreamweb (Deutsch)" dreamweb
-	fi
-	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
-			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
-		doins -r en_US
-		make_wrapper dreamweb-en_US "scummvm -f -p \"/usr/share/${PN}/en_US\" dreamweb" .
-		make_desktop_entry ${PN}-en_US "Dreamweb (US English)" dreamweb
-	fi
-	if use l10n_en-GB ; then
-		doins -r en_GB
-		make_wrapper dreamweb-en_GB "scummvm -f -p \"/usr/share/${PN}/en_GB\" dreamweb" .
-		make_desktop_entry ${PN}-en_GB "Dreamweb (UK English)" dreamweb
-	fi
-	if use l10n_es ; then
-		doins -r es
-		make_wrapper dreamweb-es "scummvm -f -p \"/usr/share/${PN}/es\" dreamweb" .
-		make_desktop_entry ${PN}-es "Dreamweb (Español)" dreamweb
-	fi
-	if use l10n_fr ; then
-		doins -r fr
-		make_wrapper dreamweb-fr "scummvm -f -p \"/usr/share/${PN}/fr\" dreamweb" .
-		make_desktop_entry ${PN}-fr "Dreamweb (Français)" dreamweb
-	fi
-	if use l10n_it ; then
-		doins -r it
-		make_wrapper dreamweb-it "scummvm -f -p \"/usr/share/${PN}/it\" dreamweb" .
-		make_desktop_entry ${PN}-it "Dreamweb (Italiano)" dreamweb
-	fi
-	use doc && dodoc -r doc/*
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		doins -r ${lang}
+		make_wrapper ${PN}-${lang} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/${lang}\" ${PN}"
+		make_desktop_entry ${PN}-${lang} "Dreamweb (${lang})"
+	done
+
+	newicon "${DISTDIR}"/cat-${PN}.png ${PN}.png
+	use doc && dodoc -r doc/.
 }
diff --git a/games-rpg/gwiz/gwiz-0.8-r1.ebuild b/games-rpg/gwiz/gwiz-0.8-r1.ebuild
index f7a462a9a302..d8d166f528bb 100644
--- a/games-rpg/gwiz/gwiz-0.8-r1.ebuild
+++ b/games-rpg/gwiz/gwiz-0.8-r1.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic
+EAPI=8
 
-DESCRIPTION="clone of old-school Wizardry(tm) games by SirTech"
-HOMEPAGE="http://icculus.org/gwiz/"
-SRC_URI="http://icculus.org/gwiz/${P}.tar.bz2"
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Clone of old-school Wizardry(tm) games by SirTech"
+HOMEPAGE="https://icculus.org/gwiz/"
+SRC_URI="https://icculus.org/gwiz/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~x86"
 SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
+LICENSE="GPL-2+"
 
-DEPEND=">=media-libs/libsdl-1.2.3[joystick,video]
-	>=media-libs/sdl-image-1.2.1-r1[png]
-	>=media-libs/sdl-ttf-2.0.4"
-RDEPEND=${DEPEND}
+DEPEND="media-libs/libsdl[joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-buffer.patch
@@ -25,12 +25,14 @@ PATCHES=(
 src_prepare() {
 	default
 
+	tc-export CC
 	append-cflags -std=gnu89 # build with gcc5 (bug #572532)
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog README doc/HOWTO-PLAY" \
-		default
+	default
+
+	dodoc doc/HOWTO-PLAY
 	newicon pixmaps/gwiz_icon.xpm ${PN}.xpm
 	make_desktop_entry gwiz Gwiz
 }
diff --git a/games-rpg/soltys/soltys-1.0-r2.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
index e9d29906063f..3b59a9cabce4 100644
--- a/games-rpg/soltys/soltys-1.0-r2.ebuild
+++ b/games-rpg/soltys/soltys-1.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 DESCRIPTION="Classic adventure game"
 HOMEPAGE="https://wiki.scummvm.org/index.php/Soltys"
@@ -10,55 +11,41 @@ SRC_URI="l10n_en? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip )
 	l10n_es? ( mirror://sourceforge/scummvm/${PN}-es-v${PV}.zip )
 	l10n_pl? ( mirror://sourceforge/scummvm/${PN}-pl-v${PV}.zip )
 	!l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip ) ) )
-	http://www.scummvm.org/images/cat-soltys.png"
+	http://www.scummvm.org/images/cat-${PN}.png"
+S="${WORKDIR}"
 
 LICENSE="Soltys"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="l10n_en l10n_es l10n_pl"
 
-RDEPEND=">=games-engines/scummvm-1.5"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		mkdir -p en || die
-		unpack ${PN}-en-v${PV}.zip
-		mv vol.{cat,dat} en/ || die
-	fi
-	if use l10n_es ; then
-		mkdir -p es || die
-		unpack ${PN}-es-v${PV}.zip
-		mv soltys-es-v1-0/vol.{cat,dat} es/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir -p pl || die
-		unpack ${PN}-pl-v${PV}.zip
-		mv vol.{cat,dat} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -rf license.txt soltys-es-v1-0
+	MY_L10N=( $(usev l10n_en) $(usev l10n_es) $(usev l10n_pl) )
+	[[ ${MY_L10N} ]] || MY_L10N=( l10n_en )
+
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		mkdir ${lang} || die
+		unpack ${PN}-${lang}-v${PV}.zip
+		if [[ ${lang} == es ]]; then
+			mv ${PN}-${lang}-v$(ver_rs 1 -)/vol.{cat,dat} ${lang}/ || die
+		else
+			mv vol.{cat,dat} ${lang}/ || die
+		fi
+	done
 }
 
 src_install() {
 	insinto /usr/share/${PN}
-	doins -r *
-	newicon "${DISTDIR}"/cat-soltys.png soltys.png
-	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		make_wrapper soltys-en "scummvm -f -p \"/usr/share/${PN}/en\" soltys" .
-		make_desktop_entry ${PN}-en "Soltys (English)" soltys
-	fi
-	if use l10n_es ; then
-		make_wrapper soltys-es "scummvm -f -p \"/usr/share/${PN}/es\" soltys" .
-		make_desktop_entry ${PN}-es "Soltys (Español)" soltys
-	fi
-	if use l10n_pl ; then
-		make_wrapper soltys-pl "scummvm -f -p \"/usr/share/${PN}/pl\" soltys" .
-		make_desktop_entry ${PN}-pl "Soltys (Polski)" soltys
-	fi
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		doins -r ${lang}
+		make_wrapper ${PN}-${lang} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/${lang}\" ${PN}"
+		make_desktop_entry ${PN}-${lang} "Soltys (${lang})"
+	done
+
+	newicon "${DISTDIR}"/cat-${PN}.png ${PN}.png
 }
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 9f08257b0275..34d871560267 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index 0873ba74cd80..b52304f50a66 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,2 +1 @@
-DIST mako-1.4.1.tar.gz 49442 BLAKE2B aa242d905d33dcfd2e30317a65d3826ba43ad344e93d1f41ed8b28f75310f724ed0eb5ae163f97a441ae07a4bb3465aa01f974cd95f97ba981a907fb761ad3d4 SHA512 25b0f59645c1815d8bdba42cedd6f56163ff663cd801a534c4c725c99e9a8cc28aef1d2c899d30cca06f0c6ddfa4a8e6efa01e5e98091347bcfc80d596f16d43
 DIST mako-1.5.tar.gz 57077 BLAKE2B 0ad931ce6408774f029855d0d98bd9444ff246f2ee82dcaa59774caddc9aaa7d632a7584eaaa4439eafd17b72935eada8400fe93e1ec7f9c23b3860049b55269 SHA512 64bb78d391bf07259a62a4045103803c8e108ac2da2fe8a413b09a0e8c2ac9c82eea1ae9576db41f7088476099fc2071543c99d3a52a35f72f5dbb537bba8c47
diff --git a/gui-apps/mako/mako-1.4.1.ebuild b/gui-apps/mako/mako-1.4.1.ebuild
deleted file mode 100644
index 7595ec3b37e9..000000000000
--- a/gui-apps/mako/mako-1.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A lightweight notification daemon for Wayland. Works on Sway."
-HOMEPAGE="https://github.com/emersion/mako"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
-else
-	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+icons"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/pango
-	x11-libs/cairo
-	|| (
-		sys-apps/systemd
-		sys-auth/elogind
-	)
-	sys-apps/dbus[user-session]
-	icons? (
-		x11-libs/gtk+:3
-		x11-libs/gdk-pixbuf
-	)
-"
-RDEPEND="
-	${DEPEND}
-	dev-libs/wayland-protocols
-"
-BDEPEND="
-	virtual/pkgconfig
-	>=app-text/scdoc-1.9.7
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dicons=$(usex icons enabled disabled)
-		"-Dwerror=false"
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 05e9ad167c7f..8c311754f032 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
index 8642e22e21e1..6bf02b33d246 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 0fb0b5844bbd..ef9685681e58 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/courier/courier-1.1.2.ebuild b/mail-mta/courier/courier-1.1.2.ebuild
index 8fa881169a0e..a1f75472c9bf 100644
--- a/mail-mta/courier/courier-1.1.2.ebuild
+++ b/mail-mta/courier/courier-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 63da06abc3de..1f9ae3c6408a 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/hydrus/hydrus-442.ebuild b/media-gfx/hydrus/hydrus-442.ebuild
index 5ce5c4bdf642..3133d5282a53 100644
--- a/media-gfx/hydrus/hydrus-442.ebuild
+++ b/media-gfx/hydrus/hydrus-442.ebuild
@@ -64,7 +64,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
index 3ea6657aaeae..fb12102cde91 100644
--- a/media-gfx/hydrus/hydrus-443.ebuild
+++ b/media-gfx/hydrus/hydrus-443.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
index 3ea6657aaeae..fb12102cde91 100644
--- a/media-gfx/hydrus/hydrus-444.ebuild
+++ b/media-gfx/hydrus/hydrus-444.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index 2c52c2dc47e1..abe83ba38720 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 2c52c2dc47e1..abe83ba38720 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1264f753f40d..3815ed651bc9 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
index 931d2f39bfcf..37ddef00f8c7 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
index ca4189f486a7..c9b389047486 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index da7981d89011..e198e43c745a 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1 +1,2 @@
 DIST liblscp-0.9.3.tar.gz 696509 BLAKE2B a3cddd07f55522291be12f2952eafd0b9761ac8c3d38c05010d9ca6593ef9db62d9bdd7a1e8f31d74fd9cbd29cbe3ade71f3b51ffa330780a0b7feb18ff71d32 SHA512 e776b0d48a9728e69b1a198d44ab88862366ecece293d71f6552ab395fd33bfdc395dbea6f56000c2ef9897ba00e0e287b0bc042fd6b6bdc1b4864b72b20753e
+DIST liblscp-0.9.4.tar.gz 697219 BLAKE2B f1824c75237e478888ffcd95c15b72e4746cbc8997924f70cced966baddb68877526cbbcd56ff419fa1eb5f1ca6a1537ce5db368ba41cac39e51813921720e9b SHA512 6aa9b15d538925edf3327ca05023bac8285611902703fec20572416dde5cd7300ed429a7db464d92b9f6c1d524b89066888f8cbd0d56283ff3c78074605f396a
diff --git a/media-libs/liblscp/liblscp-0.9.4.ebuild b/media-libs/liblscp/liblscp-0.9.4.ebuild
new file mode 100644
index 000000000000..8d147da49de0
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.9.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+https://download.linuxsampler.org/packages/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog TODO NEWS README )
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index df09aafde2b9..028be03d3a90 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
index ce5e254f4f05..c07ddcc38bde 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
@@ -1 +1,3 @@
 DIST kodi-inputstream-ffmpegdirect-1.21.3.tar.gz 251832 BLAKE2B cbaa585a3c03afece8fec690f6a7677c9c80ec08130f987633f6327eefba577167fddc89fbae33bc3d3965a41e5f30d3b691625059e620f36a85ebf7155d7011 SHA512 19c70665b518c9e1231cc0f955ede3669c2b6b2e136a2082a49f52a9aa0b4cc93621f467613309c0d9091f13505b451c13ec4722fcbde2c70bb847fb881da9df
+DIST kodi-inputstream-ffmpegdirect-1.21.4.tar.gz 273268 BLAKE2B 4e8ac6b790a0118cef8be4447ade2c41b828e3d3dac1ba6a5c72e9f3df5e8151f5e942325d471f96cc345394a622728bfc5b2b61563c394c0f13e2f2960787d5 SHA512 769ad0be12c68c78e82f050c046645050d302b02b158afa66e626b456c10cff2cb5d7df2be3a36dfb20cad0d40ac2de1b3cf1ae0a9dcf9a70691669d54304bb0
+DIST kodi-inputstream-ffmpegdirect-1.21.5.tar.gz 274498 BLAKE2B fa4fe24515dd6066503b274e5b3d989483f03d9f375342862049d7829ee192ee496bdfaa8d1eb0c9e79cec36b33b3e9016e678299916dabc96bbf8a99316c62e SHA512 178b7859289453c88f9e6ee335fba79a70139b94e6dcee55e109e6c1201c39d85764409db1958dc2f9b09a471636f00a63287cd085ce573c241712c2f8efe2d1
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.4.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.4.ebuild
new file mode 100644
index 000000000000..4ea51e4a1095
--- /dev/null
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.ffmpegdirect.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~arm64"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+	"
+
+COMMON_DEPEND="
+	media-video/ffmpeg[encode,libxml2,zlib]
+	virtual/libiconv
+	app-arch/bzip2
+	=media-tv/kodi-19*
+	"
+
+DEPEND="
+	${COMMON_DEPEND}
+	"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.5.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.5.ebuild
new file mode 100644
index 000000000000..4ea51e4a1095
--- /dev/null
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.ffmpegdirect.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~arm64"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+	"
+
+COMMON_DEPEND="
+	media-video/ffmpeg[encode,libxml2,zlib]
+	virtual/libiconv
+	app-arch/bzip2
+	=media-tv/kodi-19*
+	"
+
+DEPEND="
+	${COMMON_DEPEND}
+	"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index cc00a3afdb89..85c46ba1b204 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -2,3 +2,4 @@ DIST kodi-pvr-argustv-6.0.1.tar.gz 153659 BLAKE2B c991b1addcc81e4e07f763b0794f2a
 DIST kodi-pvr-argustv-6.0.2.tar.gz 154313 BLAKE2B 54cf2619e1aa3bab0876ac3e5d18e5acbacbf336d8c697cfb5ad1135577e085330b98d89cd25cf551afa44c09acc4433267b799e511e79e8263eb9cfa365fdcb SHA512 dd6b40d274fe2325660865fd9a814baff0a3440d98d076d8636efcd65fbca63972e8ae22f04bd149f2feac1e8334a87c751031fdd1d915089f766e1089590f4e
 DIST kodi-pvr-argustv-7.0.0.tar.gz 154784 BLAKE2B 5a6b604de69e5645814101191d3b79027f7b0aebea0eaf30962c9e70bf5228a99e936a50b36be33671a30b4cd4e2d2d33325b1161f22c738369f2f241c086664 SHA512 8ebe04087a0f0db0efcc111ecab6a8940d23dabd6244c6fca44c05a9fceaec54cbd175fe9bd6d79c6d95c6787c8fc147b76e06b6ce509da6007f3ab0d4bf8840
 DIST kodi-pvr-argustv-7.1.1.tar.gz 156270 BLAKE2B 57436cc9c896a08b2b7b2eff94401530f90bc8bc5b38f24c94b0616e353f97cc2f23973637a95413d12e9459a9e0d4014a38f671d69c9854b3b4d923a9dd7531 SHA512 831fd6d7dba40aef87a9cf6b36bfcda66f53fb36cc8487f741ba33b8cadf87b053ada0cc1b463d46abfa976054eedd5ba7428704ef8d2574a1b23acadfd49f82
+DIST kodi-pvr-argustv-7.1.2.tar.gz 158003 BLAKE2B bf16201bf0f272796aa4e2518ed07113f268b32bf9af857f600b09dc7e86eb00de2a542047fd8742bfb6c523942018816d6130f715dfe2e21d3939debae5f8d5 SHA512 980786c37e1c28e3d8cbe53ef1a9bcdd0dee585bdfe2654154a571d5b9f48b8139f3acc9e3cab06302900ec933f2525875b99ca8ad562ff137a94db875bef59b
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild
new file mode 100644
index 000000000000..897f6aa64638
--- /dev/null
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's ARGUS TV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 92b132929210..b971aed9a188 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1 +1,2 @@
 DIST kodi-pvr-hts-8.3.0.tar.gz 181974 BLAKE2B d86bea7a037ea0abf4a2e6e9b45fb7c69f03d4f29f7b97f9ed0367bee3d243e09fb1b3998c437e9103672de4bd8fa7422f5c89ac35e87c5ebccf730f3d2a3c71 SHA512 4c49e5351608da49317e4916e8f60d88df0f9f907ce0cae026708e758f6937e33ab25dcb82351986dc3f3b8d73f40222db38bdb3db046c8b67b0c17ef7892abf
+DIST kodi-pvr-hts-8.3.1.tar.gz 190434 BLAKE2B d1a2d17e94e02ec37d0598c5d550859db46214bb0acc20034b809386935301499cba53bae8db8668099d82deab986983f3952cc879a4160ae1bf1b992c347b6d SHA512 adbc77518f45d0c745edb8c1c687b4a3165b8d96f62f5a923b327f0ad89a52a7f1d45ad4541ac1dd9bc8f22b2537c018d977db4e0e8ee6fa3c9495bd36eb7fc3
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild
new file mode 100644
index 000000000000..2229139c850a
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 20c87ce3ea7e..c200f6e7beed 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,2 +1,3 @@
 DIST kodi-pvr-vuplus-7.4.3.tar.gz 285230 BLAKE2B 0ef24cb24f745494ea86ea025943bd4c159beaa684cacad569ef603d355b917351b92dd145d1fc8e3069896f404727f6aaa2567b5f3633fcfa9dbdd1c60fd09e SHA512 b563c29600126ac0d25c744be64d060691331a875b7945c211f1267daa43d8db034c717b1def49ad85aaf50f81826e4c7ffcff08ad4422fa67abe2ea3cf5557f
 DIST kodi-pvr-vuplus-7.4.4.tar.gz 946491 BLAKE2B d3a64a10b7d0b0774aadf6290f70a6f8fd90de0790616d4b64927316c46929c77cb49fa0d69aaf5ba847513d5ad1fa2d208557e4b0b071c04bda94f53a3d086f SHA512 21d705116816d6acc1b70b6b1bebc0ca4bc0eedc2e55c204697608597d6bc88be47b16f18a2d1b04f8f22600a5388062ae259842702ab1d2170ace496edee2b7
+DIST kodi-pvr-vuplus-7.4.5.tar.gz 947455 BLAKE2B 055afbc8dd7e902771b88e34b47ff7d42ab6e30de27d1779f54847a4d04cda920552b3bbcac46e1ae26f5a113f014d04998aec71b83c4ab242f966035df398ce SHA512 04ba9ab1b7aee4418c305538ac880aae80c1523fed10d7104dce8a294c072d6be87469016fc673e4d54cc1faaab0074cd15f6edf3207ad88a962d4a41844985b
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild
new file mode 100644
index 000000000000..20323489f843
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 030a93615e6d..521674fdab0e 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
index ba0d73a00569..c7eb8de786ca 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 0b73e929da09..e6d07841dc8e 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1 +1,2 @@
 DIST qsampler-0.9.3.tar.gz 283882 BLAKE2B 1171de42c7f27481a5e2f95c1d868b68594288d3a640fe118df9a7f1588d0fea73e06bad4d3acd08a99ec4ccceaee7d171a047a96e811be09ebb3c48896e064f SHA512 0abfcb35aafb773d1b0f2c31406ea7b04581a4a47b01074c70d1b4833a3f06e8223cfa57b1e7f0233bc347636f41732db37150e5bfde76ccaad4eb959428a7ba
+DIST qsampler-0.9.4.tar.gz 284055 BLAKE2B 83f0eb7102d6dbba994d2efeee59ebc46ce2b07d40b9dcfe97ed3059fefd449fa90167718ef65ef41f04709ef9c985c86e2b35a0572b47a948172cf5b1a5dc23 SHA512 0e43a335c503bd76d41bfe88967b199bcd8c34a44a65293c1460daa342ca1e35f236984af74e30404637e9f6c8428b4cc52fc27501af7d52e1c9e30f1a80d35e
diff --git a/media-sound/qsampler/qsampler-0.9.4.ebuild b/media-sound/qsampler/qsampler-0.9.4.ebuild
new file mode 100644
index 000000000000..d948252e61b9
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake qmake-utils xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +libgig"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-cmake-no-git.patch"
+)
+
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 6b75a2087556..4d84a27ed381 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1 +1,2 @@
 DIST qsynth-0.9.3.tar.gz 395265 BLAKE2B c19154ba02680ae784ea016bbcb2dcd6c3517d6e810d76cc16919508e2e7310d23a8e8397f45340c138f018340525ecae8d941ce5acf5d4e16295e88d3450069 SHA512 7da5bc0fd8feed6b3b0b048e7ac3fa86937d82ff34528fd0dbb1dd5a05fbff2bb2d8e360e499325660172acec7216964ce1442b75afc10ab0647b91376b2c421
+DIST qsynth-0.9.4.tar.gz 395550 BLAKE2B e25195755c52c63912b03a416878d248712b78ba0014414bc8b1d31cbd5bb75562640de4a0255d2727a40274a6ff3a84b201d39c93674140ff31ccc581bfd254 SHA512 764a90fd86451cd3a12c71f061f4a603cdce54ae80e6543d05fa66a97ea0b7c50bac0350f01f597ec93ed445a5433a9dea6d9c5a43ce385c231aaea8e13675d4
diff --git a/media-sound/qsynth/qsynth-0.9.4.ebuild b/media-sound/qsynth/qsynth-0.9.4.ebuild
new file mode 100644
index 000000000000..59c6e5666ca2
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop qmake-utils xdg
+
+DESCRIPTION="Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${D}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index 6c2b729f2933..9a1ef5c1c8a7 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -21,8 +21,6 @@
 	this for all the file formats it supports -- Ogg Vorbis, FLAC, MP3, 
 	Musepack, and MOD.</longdescription>
 	<upstream>
-		<remote-id type="google-code">quodlibet</remote-id>
 		<remote-id type="github">quodlibet/quodlibet</remote-id>
-		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/rosegarden/rosegarden-21.06.ebuild b/media-sound/rosegarden/rosegarden-21.06.ebuild
index 6cc3ac2b875d..2b7ce2c22641 100644
--- a/media-sound/rosegarden/rosegarden-21.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-21.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/spotify/spotify-1.1.56.ebuild b/media-sound/spotify/spotify-1.1.56.ebuild
index 2ec7cf64b054..0b02e6e47079 100644
--- a/media-sound/spotify/spotify-1.1.56.ebuild
+++ b/media-sound/spotify/spotify-1.1.56.ebuild
@@ -11,7 +11,7 @@ BUILD_ID_AMD64="595.g2d2da0de"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libnotify local-playback pax-kernel pulseaudio systray"
 RESTRICT="mirror strip"
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f81fd8e1069b..65d4067a372a 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vcsi/vcsi-7-r1.ebuild b/media-video/vcsi/vcsi-7-r2.ebuild
similarity index 92%
rename from media-video/vcsi/vcsi-7-r1.ebuild
rename to media-video/vcsi/vcsi-7-r2.ebuild
index a597fdeb48eb..758e644704a3 100644
--- a/media-video/vcsi/vcsi-7-r1.ebuild
+++ b/media-video/vcsi/vcsi-7-r2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,truetype,${PYTHON_USEDEP}]
 	dev-python/texttable[${PYTHON_USEDEP}]
 	media-fonts/dejavu
 	media-video/ffmpeg"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 260a591acd02..8d03142e8eef 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 2616a02a7074..97a12697abc3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Jul 2021 13:09:07 +0000
+Tue, 06 Jul 2021 07:39:07 +0000
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 92b8d40924f6..1859919b5f5d 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202107-05.xml b/metadata/glsa/glsa-202107-05.xml
new file mode 100644
index 000000000000..292c32b550aa
--- /dev/null
+++ b/metadata/glsa/glsa-202107-05.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-05">
+  <title>libxml2: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in libxml2, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">libxml2</product>
+  <announced>2021-07-06</announced>
+  <revised count="1">2021-07-06</revised>
+  <bug>749849</bug>
+  <bug>790002</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="dev-libs/libxml2" auto="yes" arch="*">
+      <unaffected range="ge">2.9.11</unaffected>
+      <vulnerable range="lt">2.9.11</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libxml2 is the XML (eXtended Markup Language) C parser and toolkit
+      initially developed for the GNOME project.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in libxml2. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="low">
+    <p>A remote attacker could entice a user to process a specially crafted XML
+      document using an application linked against libxml2, possibly resulting
+      in a Denial of Service condition or obtaining sensitive information.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libxml2 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/libxml2-2.9.12-r3"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-24977">CVE-2020-24977</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3516">CVE-2021-3516</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3517">CVE-2021-3517</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3518">CVE-2021-3518</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3537">CVE-2021-3537</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3541">CVE-2021-3541</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-05-24T00:17:09Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2021-07-06T03:13:56Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-06.xml b/metadata/glsa/glsa-202107-06.xml
new file mode 100644
index 000000000000..369536037a98
--- /dev/null
+++ b/metadata/glsa/glsa-202107-06.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-06">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabillities have been found in Chromium and Google
+    Chrome, the worst of which could allow remote attackers to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">google-chrome,chromium</product>
+  <announced>2021-07-06</announced>
+  <revised count="1">2021-07-06</revised>
+  <bug>789420</bug>
+  <bug>792084</bug>
+  <bug>795204</bug>
+  <bug>796338</bug>
+  <bug>796521</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">91.0.4472.114</unaffected>
+      <vulnerable range="lt">91.0.4472.114</vulnerable>
+    </package>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">91.0.4472.114</unaffected>
+      <vulnerable range="lt">91.0.4472.114</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+    
+    <p>Google Chrome is one fast, simple, and secure browser for all your
+      devices.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium and Google
+      Chrome. Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker could execute arbitrary code, escalate privileges,
+      obtain sensitive information, spoof a URL or cause a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Google Chrome users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/google-chrome-91.0.4472.114"
+    </code>
+    
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-91.0.4472.114"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30506">CVE-2021-30506</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30507">CVE-2021-30507</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30508">CVE-2021-30508</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30509">CVE-2021-30509</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30510">CVE-2021-30510</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30511">CVE-2021-30511</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30512">CVE-2021-30512</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30513">CVE-2021-30513</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30514">CVE-2021-30514</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30515">CVE-2021-30515</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30516">CVE-2021-30516</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30517">CVE-2021-30517</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30518">CVE-2021-30518</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30519">CVE-2021-30519</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30520">CVE-2021-30520</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30521">CVE-2021-30521</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30522">CVE-2021-30522</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30523">CVE-2021-30523</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30524">CVE-2021-30524</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30525">CVE-2021-30525</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30526">CVE-2021-30526</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30527">CVE-2021-30527</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30528">CVE-2021-30528</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30530">CVE-2021-30530</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30531">CVE-2021-30531</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30532">CVE-2021-30532</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30533">CVE-2021-30533</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30534">CVE-2021-30534</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30536">CVE-2021-30536</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30537">CVE-2021-30537</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30538">CVE-2021-30538</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30539">CVE-2021-30539</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30540">CVE-2021-30540</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30544">CVE-2021-30544</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30545">CVE-2021-30545</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30546">CVE-2021-30546</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30548">CVE-2021-30548</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30549">CVE-2021-30549</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30550">CVE-2021-30550</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30551">CVE-2021-30551</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30552">CVE-2021-30552</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30553">CVE-2021-30553</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30554">CVE-2021-30554</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30555">CVE-2021-30555</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30556">CVE-2021-30556</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30557">CVE-2021-30557</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-05T03:25:38Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-06T03:30:34Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-07.xml b/metadata/glsa/glsa-202107-07.xml
new file mode 100644
index 000000000000..9a915ff4592f
--- /dev/null
+++ b/metadata/glsa/glsa-202107-07.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-07">
+  <title>glibc: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities in glibc could result in Denial of
+    Service.
+  </synopsis>
+  <product type="ebuild">glibc</product>
+  <announced>2021-07-06</announced>
+  <revised count="1">2021-07-06</revised>
+  <bug>764176</bug>
+  <bug>767718</bug>
+  <bug>772425</bug>
+  <bug>792261</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="sys-libs/glibc" auto="yes" arch="*">
+      <unaffected range="ge">2.33-r1</unaffected>
+      <vulnerable range="lt">2.33-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>glibc is a package that contains the GNU C library.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in glibc. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could cause a possible Denial of Service condition.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All glibc users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-libs/glibc-2.33-r1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-25013">CVE-2019-25013</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-27618">CVE-2020-27618</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-27645">CVE-2021-27645</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3326">CVE-2021-3326</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33574">CVE-2021-33574</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-05T02:27:53Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-06T03:37:10Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-08.xml b/metadata/glsa/glsa-202107-08.xml
new file mode 100644
index 000000000000..07a104b936be
--- /dev/null
+++ b/metadata/glsa/glsa-202107-08.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-08">
+  <title>PostSRSd: Denial of service</title>
+  <synopsis>Multiple vulnerabilities in PostSRSd could lead to a Denial of
+    Service condition.
+  </synopsis>
+  <product type="ebuild">postsrsd</product>
+  <announced>2021-07-06</announced>
+  <revised count="1">2021-07-06</revised>
+  <bug>760821</bug>
+  <bug>793674</bug>
+  <access>remote</access>
+  <affected>
+    <package name="mail-filter/postsrsd" auto="yes" arch="*">
+      <unaffected range="ge">1.11</unaffected>
+      <vulnerable range="lt">1.11</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PostSRSd is a Postfix sender rewriting scheme daemon</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in PostSRSd. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could cause a possible Denial of Service condition.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All postsrsd users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=mail-filter/postsrsd-1.11"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35573">CVE-2020-35573</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-35525">CVE-2021-35525</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-02-20T19:48:10Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2021-07-06T03:43:40Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2616a02a7074..e132c4cc4fb4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Jul 2021 13:09:07 +0000
+Tue, 06 Jul 2021 07:39:08 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 0fbb29b111c8..602282af5536 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-d293bbd455c078508ed7f2ca6e48c2cebbf19c5c 1625283274 2021-07-03T03:34:34+00:00
+d5498e11fb46ecd11f28b6155b5c630c666b7bea 1625543171 2021-07-06T03:46:11+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 17b19f9767e2..057af5d9d0dd 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 74b005dfc667..70c20d6d310c 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-2.10.7 b/metadata/md5-cache/app-admin/ansible-2.10.7
index 58ca39d23022..c0d18bf31dbc 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.7
+++ b/metadata/md5-cache/app-admin/ansible-2.10.7
@@ -1,6 +1,6 @@
 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
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <app-admin/ansible-base-2.11 test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh <app-admin/ansible-base-2.11 dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <app-admin/ansible-base-2.11 test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh <app-admin/ansible-base-2.11 dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.7.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=796048c74255f34773fed50e2ae59aca
+_md5_=6ef2778d615bb8038332973f949c7790
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.10 b/metadata/md5-cache/app-admin/ansible-base-2.10.10
index ed1da7ce35c7..9b8f4fc2e835 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.10
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.10
@@ -1,6 +1,6 @@
 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
-DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.10.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=605dd7c4e6b02071b5343afa9fbcb73b
+_md5_=dc3dd91e083aed9b244d539c2d28ef5b
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.9 b/metadata/md5-cache/app-admin/ansible-base-2.10.9
index 654d9e97fa49..c7871ef59e85 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.9
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.9
@@ -1,6 +1,6 @@
 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
-DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.9.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f976f4d2feba2d7625b36f74dbe5e1d
+_md5_=b695602c32b714db66a04729f5889672
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.1 b/metadata/md5-cache/app-admin/ansible-base-2.11.1
index 5302e72792ab..ad6af2f9eb19 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.1
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.1
@@ -1,6 +1,6 @@
 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
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://www.ansible.com/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20c8011f43e4321515cf107ad28a549e
+_md5_=638dff5cc980e0d7f39906f2249b45d4
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.2 b/metadata/md5-cache/app-admin/ansible-base-2.11.2
index dcd88d98f069..5fd9e2a93be5 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.2
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.2
@@ -1,6 +1,6 @@
 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
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://www.ansible.com/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20c8011f43e4321515cf107ad28a549e
+_md5_=638dff5cc980e0d7f39906f2249b45d4
diff --git a/metadata/md5-cache/app-admin/ansible-base-9999 b/metadata/md5-cache/app-admin/ansible-base-9999
index 0f78a9671659..dda2cea3d958 100644
--- a/metadata/md5-cache/app-admin/ansible-base-9999
+++ b/metadata/md5-cache/app-admin/ansible-base-9999
@@ -1,6 +1,6 @@
 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(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://www.ansible.com/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20c8011f43e4321515cf107ad28a549e
+_md5_=638dff5cc980e0d7f39906f2249b45d4
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.7 b/metadata/md5-cache/app-admin/rasdaemon-0.6.7
index f476c89cb2eb..2cdc25720bf2 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.7
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=Reliability, Availability and Serviceability logging tool
 EAPI=7
 HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
 IUSE=sqlite kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/gettext sys-apps/dmidecode sqlite? ( dev-db/sqlite dev-perl/DBD-SQLite )
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.7.tar.bz2
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1782469326d90475ab3a2ddf7ec3d5ea
+_md5_=9f52c64bc3f3ec3787c9431077b41788
diff --git a/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.44 b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.44
index c609db488649..8052e2b7d9db 100644
--- a/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.44
+++ b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.44
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Spectre & Meltdown vulnerability/mitigation checker for Linux
 EAPI=7
 HOMEPAGE=https://github.com/speed47/spectre-meltdown-checker
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/speed47/spectre-meltdown-checker/archive/v0.44.tar.gz -> spectre-meltdown-checker-0.44.tar.gz
-_md5_=14415da4da907312582c03c92c444764
+_md5_=25f6a614985e5e68cf19b130990944ed
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.30.1 b/metadata/md5-cache/app-admin/syslog-ng-3.30.1
index a5555cdfc518..e84e9fef5370 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.30.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.30.1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex 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=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.30.1/syslog-ng-3.30.1.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a95f212a0c522d57a269fdb3d17fb078
+_md5_=b83b6a91e14dd8cb116b97e2252a3b7e
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r1 b/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r2
similarity index 83%
rename from metadata/md5-cache/app-admin/syslog-ng-3.30.1-r1
rename to metadata/md5-cache/app-admin/syslog-ng-3.30.1-r2
index 94def86e9e71..2078c4885fa1 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r2
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex 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=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.30.1/syslog-ng-3.30.1.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b232f698b662117e279adb8862ffc2b
+_md5_=88df5037d742ae2fd582ef2fea559926
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.31.2 b/metadata/md5-cache/app-admin/syslog-ng-3.31.2-r1
similarity index 82%
rename from metadata/md5-cache/app-admin/syslog-ng-3.31.2
rename to metadata/md5-cache/app-admin/syslog-ng-3.31.2-r1
index 1ef5d8f7d8cb..33f90d953ae3 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.31.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.31.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex 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=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= >=sys-devel/bison-3.7.6 test? ( dev-libs/criterion )
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= >=sys-devel/bison-3.7.6 test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( python )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.31.2/syslog-ng-3.31.2.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=542bfa80f901ca177729a7a177d96179
+_md5_=27fb081421271d8c054922f411a2275e
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.32.1 b/metadata/md5-cache/app-admin/syslog-ng-3.32.1-r1
similarity index 85%
rename from metadata/md5-cache/app-admin/syslog-ng-3.32.1
rename to metadata/md5-cache/app-admin/syslog-ng-3.32.1-r1
index ac2f382dbe20..8d88278b162d 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.32.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.32.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex 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=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= >=sys-devel/bison-3.7.6 test? ( dev-libs/criterion )
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= >=sys-devel/bison-3.7.6 test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( python )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.32.1/syslog-ng-3.32.1.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a57942362cd3c30daa101ac74c93f700
+_md5_=a847f7b3065e5d75d505571ec6686633
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index c38b389eff33..474dc0174647 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/dar-2.7.1 b/metadata/md5-cache/app-backup/dar-2.7.1
index 9884c0f4211a..17521dc2ad44 100644
--- a/metadata/md5-cache/app-backup/dar-2.7.1
+++ b/metadata/md5-cache/app-backup/dar-2.7.1
@@ -5,7 +5,7 @@ DESCRIPTION=A full featured backup tool, aimed for disks
 EAPI=7
 HOMEPAGE=http://dar.linux.free.fr/
 IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2 ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar:= ) xattr? ( sys-apps/attr:= )
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.7.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f22bc82ff6fd7718edffad8d23f6f5f3
+_md5_=70cf85f6e63f53ed8ada5684f7d0f81a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 3ebbe568ab7f..e86f9c72decb 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/acme-1.15.0 b/metadata/md5-cache/app-crypt/acme-1.15.0
deleted file mode 100644
index 7b5757c0fc89..000000000000
--- a/metadata/md5-cache/app-crypt/acme-1.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.3.0[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=68dfdb3d537c2b088ba7872c7c6a049f
diff --git a/metadata/md5-cache/app-crypt/certbot-1.15.0 b/metadata/md5-cache/app-crypt/certbot-1.15.0
deleted file mode 100644
index 29594e957d5e..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-1.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=45c2e91ef91e308f74c7c4ec2d1add8a
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.15.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.15.0
deleted file mode 100644
index dfc654b5bf7f..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-crypt/certbot-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=db3994821ec4a149bfb1f7b623b5a3fa
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.15.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.15.0
deleted file mode 100644
index e965429b9f70..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-crypt/certbot-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c9b592674587c175081f9b45a401b9c6
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 924082c10f59..849f89ea91d4 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/pms-8_p20210613 b/metadata/md5-cache/app-doc/pms-8_p20210613
deleted file mode 100644
index 42e2027d2318..000000000000
--- a/metadata/md5-cache/app-doc/pms-8_p20210613
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-texlive/texlive-bibtexextra >=dev-texlive/texlive-latexextra-2020-r2 dev-texlive/texlive-mathscience virtual/latex-base html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )
-DEFINED_PHASES=compile install
-DESCRIPTION=Gentoo Package Manager Specification
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification
-IUSE=html twoside
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=CC-BY-SA-4.0
-RDEPEND=!app-doc/pms-bin
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/pms-8_p20210613.tar.xz
-_md5_=3aa505a668a8776e99f8e80c9a27c4db
diff --git a/metadata/md5-cache/app-doc/pms-8_p20210613-r1 b/metadata/md5-cache/app-doc/pms-8_p20210613-r1
index 7cef2a24caaf..84ae0345dc41 100644
--- a/metadata/md5-cache/app-doc/pms-8_p20210613-r1
+++ b/metadata/md5-cache/app-doc/pms-8_p20210613-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Gentoo Package Manager Specification
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification
 IUSE=html twoside
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=CC-BY-SA-4.0
 RDEPEND=!app-doc/pms-bin
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/pms-8_p20210613.tar.xz
-_md5_=330309bb581931ff587a2cc2c552a6e2
+_md5_=f52ad99787afe61bff0fdfaee5544597
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 18128f6f1626..810f79d86b42 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/cloud-init-20.4 b/metadata/md5-cache/app-emulation/cloud-init-20.4
index cce5574304b4..4f0061951ee5 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-20.4
+++ b/metadata/md5-cache/app-emulation/cloud-init-20.4
@@ -1,6 +1,6 @@
 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 postinst prepare test
-DEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?] dev-python/oauthlib[python_targets_python3_8(-)?] dev-python/pyserial[python_targets_python3_8(-)?] >=dev-python/configobj-5.0.2[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/requests[python_targets_python3_8(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?] dev-python/jsonschema[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] >=dev-python/httpretty-0.7.1[python_targets_python3_8(-)?] dev-python/mock[python_targets_python3_8(-)?] dev-python/nose[python_targets_python3_8(-)?] dev-python/unittest2[python_targets_python3_8(-)?] dev-python/coverage[python_targets_python3_8(-)?] dev-python/contextlib2[python_targets_python3_8(-)?] )
+DEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?] dev-python/oauthlib[python_targets_python3_8(-)?] dev-python/pyserial[python_targets_python3_8(-)?] >=dev-python/configobj-5.0.2[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/requests[python_targets_python3_8(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?] dev-python/jsonschema[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] >=dev-python/httpretty-0.7.1[python_targets_python3_8(-)?] dev-python/mock[python_targets_python3_8(-)?] dev-python/nose[python_targets_python3_8(-)?] dev-python/coverage[python_targets_python3_8(-)?] )
 DESCRIPTION=Cloud instance initialisation magic
 EAPI=7
 HOMEPAGE=https://launchpad.net/cloud-init
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/20.4/+download/cloud-init-20.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=540ce6ae24c93626658a1431263cc088
+_md5_=8a53e0ed9caa4f56d3a33b55ea69e0d5
diff --git a/metadata/md5-cache/app-emulation/cloud-init-21.2 b/metadata/md5-cache/app-emulation/cloud-init-21.2
index ef59f7536b68..5f0c72634e1f 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-21.2
+++ b/metadata/md5-cache/app-emulation/cloud-init-21.2
@@ -1,6 +1,6 @@
 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 postinst prepare test
-DEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configobj-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httpretty-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/contextlib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configobj-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httpretty-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Cloud instance initialisation magic
 EAPI=7
 HOMEPAGE=https://launchpad.net/cloud-init
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/21.2/+download/cloud-init-21.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da08d115a79f03b7f12dfefaa2544c21
+_md5_=9b10acd2916adfbb49161069054bc116
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index 1ed8f3f57d44..e8590143e1bb 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -1,6 +1,6 @@
 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(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configobj-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httpretty-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/contextlib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configobj-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httpretty-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Cloud instance initialisation magic
 EAPI=7
 HOMEPAGE=https://launchpad.net/cloud-init
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8367012691e83b61b1e5f1b187c4f9d9
+_md5_=b4e889b05da23623ca61d8933300019c
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.12.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.12.0
index 7f06b77baddc..a77580a809d9 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.12.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=Golden Disk Image builder.
 EAPI=7
 HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/networkx-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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(-)?] >=dev-python/setuptools-42.0.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/d/diskimage-builder/diskimage-builder-3.12.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f3cec61237aad6cb3d0bccb039ed949e
+_md5_=3ec39e4f0200ff1a26b3d8024a18e251
diff --git a/metadata/md5-cache/app-emulation/skopeo-1.3.1 b/metadata/md5-cache/app-emulation/skopeo-1.3.1
new file mode 100644
index 000000000000..127bd24d2a4f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/skopeo-1.3.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >=sys-fs/lvm2-2.02.145:= dev-go/go-md2man
+DESCRIPTION=Command line utility foroperations on container images and image repositories
+EAPI=7
+HOMEPAGE=https://github.com/containers/skopeo
+IUSE=btrfs
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >=sys-fs/lvm2-2.02.145:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/skopeo/archive/v1.3.1.tar.gz -> skopeo-1.3.1.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	bf028003684a8b018e4de9e3c272ed33	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=98c9aaeca099a61cb0cef9d5e501d9d1
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.21 b/metadata/md5-cache/app-emulation/virt-what-1.21
index f5b0257b8c6a..200ed228a8f2 100644
--- a/metadata/md5-cache/app-emulation/virt-what-1.21
+++ b/metadata/md5-cache/app-emulation/virt-what-1.21
@@ -4,9 +4,9 @@ DESCRIPTION=Detects if the current machine is running in a virtual machine
 EAPI=7
 HOMEPAGE=https://people.redhat.com/~rjones/virt-what/
 IUSE=dmi
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dmi? ( sys-apps/dmidecode )
 SLOT=0
 SRC_URI=https://people.redhat.com/~rjones/virt-what/files/virt-what-1.21.tar.gz
-_md5_=750b1b236b56e1ad4b858f6f1a295ba3
+_md5_=78f491003b66c79381a130341ed76443
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 77892241e6ed..532f8b63a453 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/piper-0.5.1-r1 b/metadata/md5-cache/app-misc/piper-0.5.1-r2
similarity index 88%
rename from metadata/md5-cache/app-misc/piper-0.5.1-r1
rename to metadata/md5-cache/app-misc/piper-0.5.1-r2
index 6195b02f095b..1a6173c65434 100644
--- a/metadata/md5-cache/app-misc/piper-0.5.1-r1
+++ b/metadata/md5-cache/app-misc/piper-0.5.1-r2
@@ -1,6 +1,6 @@
 BDEPEND=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] ) virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup test
-DEPEND=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] ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.13 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] ) dev-libs/libevdev virtual/libudev
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=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] ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.13 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] ) dev-libs/libevdev virtual/libudev dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GTK configuration application for libratbag
 EAPI=7
 HOMEPAGE=https://github.com/libratbag/piper
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/libratbag/piper/archive/0.5.1.tar.gz -> piper-0.5.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=77ee276f93c18afebc96f31f23e39dad
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=42e6acf9b5f34bb199216759e8f16a0a
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index c1b339eb0b32..1f4553da39f1 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/golop-0.0.1-r1 b/metadata/md5-cache/app-portage/golop-0.0.1-r1
deleted file mode 100644
index 769d3e42b24b..000000000000
--- a/metadata/md5-cache/app-portage/golop-0.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=A pure Go re-implementation of genlop
-EAPI=6
-HOMEPAGE=https://github.com/klausman/golop
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/klausman/golop/archive/v0.0.1.tar.gz -> golop-0.0.1.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=b6bd001be12f9e6e4c265569ed25443a
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.90.1 b/metadata/md5-cache/app-portage/portage-utils-0.90.1
deleted file mode 100644
index 92c615cd7fc4..000000000000
--- a/metadata/md5-cache/app-portage/portage-utils-0.90.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
-DESCRIPTION=Small and fast Portage helper tools written in C
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
-IUSE=nls static openmp +qmanifest +qtegrity
-KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.90.1.tar.xz
-_md5_=f7c7b60e1ef308cf771bc1ce47ae6575
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.91 b/metadata/md5-cache/app-portage/portage-utils-0.92
similarity index 99%
rename from metadata/md5-cache/app-portage/portage-utils-0.91
rename to metadata/md5-cache/app-portage/portage-utils-0.92
index 2d52786595ac..901eb470db68 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.91
+++ b/metadata/md5-cache/app-portage/portage-utils-0.92
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.91.tar.xz
+SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.92.tar.xz
 _md5_=541beeab6d8c88d8b8f1c873413053c7
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 03ce1add3c0c..d2eaefe5f1da 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/kramdown-rfc2629-1.4.18 b/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
similarity index 97%
rename from metadata/md5-cache/app-text/kramdown-rfc2629-1.4.18
rename to metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
index a74fd3b91ed4..3f9bd35f8956 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.18
+++ b/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
@@ -11,6 +11,6 @@ RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby26(-)]
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.4.18.gem
+SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.4.19.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7688d46bc2c4365022bb3b4df12ee7c0
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6bb3505f075a..f568a7ae389e 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/libdbi-0.9.0 b/metadata/md5-cache/dev-db/libdbi-0.9.0
index 02662e42b02a..78adf7c56af0 100644
--- a/metadata/md5-cache/dev-db/libdbi-0.9.0
+++ b/metadata/md5-cache/dev-db/libdbi-0.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=A database-independent abstraction layer in C
 EAPI=7
 HOMEPAGE=http://libdbi.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 PDEPEND=>=dev-db/libdbi-drivers-0.9.0
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi/libdbi-0.9.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6de33aebe80cecc7ce7a061b3756d84
+_md5_=8d6ee9d1d1e939b8b647f244370c1c27
diff --git a/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1 b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
index dbbe245a88d5..d4004085e234 100644
--- a/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
+++ b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The libdbi-drivers project maintains drivers for libdbi
 EAPI=7
 HOMEPAGE=http://libdbi-drivers.sourceforge.net/
 IUSE=doc firebird mysql oci8 postgres +sqlite static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/libdbi-0.9.0 firebird? ( dev-db/firebird ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( mysql postgres sqlite firebird oci8 )
@@ -13,4 +13,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libdbi-drivers/libdbi-drivers/libdbi-drivers-0.9.0/libdbi-drivers-0.9.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0eaeec91a20a2f94927be63313a5f353
+_md5_=c7eb9ad378abc0637502cd5a336f1f7d
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13
index ca157019d758..2cdc3e68075d 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13
@@ -5,11 +5,11 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+curl gnutls kerberos +ssl 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl: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(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( 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(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.org/f/connector-c-3.1.13/mariadb-connector-c-3.1.13-src.tar.gz?serve -> mariadb-connector-c-3.1.13-src.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0e50b7270f147be9fce89b4dcf4d91fa
+_md5_=af928b31e5b9f3af422bdd3fd57a8a68
diff --git a/metadata/md5-cache/dev-db/postgresql-10.16 b/metadata/md5-cache/dev-db/postgresql-10.16
deleted file mode 100644
index 2a5b641a4a58..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-10.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=10
-SRC_URI=https://ftp.postgresql.org/pub/source/v10.16/postgresql-10.16.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=457223eaae45016170fa32221939b3a1
diff --git a/metadata/md5-cache/dev-db/postgresql-11.11 b/metadata/md5-cache/dev-db/postgresql-11.11
deleted file mode 100644
index 62fd1f63ae2c..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-11.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=11
-SRC_URI=https://ftp.postgresql.org/pub/source/v11.11/postgresql-11.11.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=706e388d24e6eb040727cf623a8e6a66
diff --git a/metadata/md5-cache/dev-db/postgresql-12.6 b/metadata/md5-cache/dev-db/postgresql-12.6
deleted file mode 100644
index 431dd14b199e..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-12.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=12
-SRC_URI=https://ftp.postgresql.org/pub/source/v12.6/postgresql-12.6.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b03fafb56375de553abce91020d0dae
diff --git a/metadata/md5-cache/dev-db/postgresql-13.2 b/metadata/md5-cache/dev-db/postgresql-13.2
deleted file mode 100644
index b263c066f309..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=13
-SRC_URI=https://ftp.postgresql.org/pub/source/v13.2/postgresql-13.2.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5b3d3735c2ab2ff1e73f2f04ae02674
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.21 b/metadata/md5-cache/dev-db/postgresql-9.6.21
deleted file mode 100644
index 4de39b43a8e4..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-9.6.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap nls pam perl pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=9.6
-SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.21/postgresql-9.6.21.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8f6a58f9b3abc00d6535dca4a415f99
diff --git a/metadata/md5-cache/dev-db/redis-6.2.4 b/metadata/md5-cache/dev-db/redis-6.2.4
index f3c2d7cf8613..9138d5acad2a 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.4
+++ b/metadata/md5-cache/dev-db/redis-6.2.4
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc ssl systemd tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.4.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	20268f317853c44164a3065f1e6ff68b	lua-utils	a2553e8a65058f277bf0b2da4be361b0	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5170e99a454c25625db52faa62ed6e50
+_md5_=ed47097c3491e9374a24f7513fc3a60a
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 334326321e3d..3342fc79844d 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.1.1 b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
new file mode 100644
index 000000000000..113a132bc58b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A project automation and build tool with a Groovy based DSL
+EAPI=7
+HOMEPAGE=https://www.gradle.org/
+IUSE=doc elibc_FreeBSD source
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=7.1.1
+SRC_URI=https://services.gradle.org/distributions/gradle-7.1.1-all.zip -> gradle-bin-7.1.1.zip
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=6e66e2f2b2d3975e2e9a5002bb932c0c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
new file mode 100644
index 000000000000..65a1d017eca6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.8/src/apache-tomcat-10.0.8-src.tar.gz
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=77fd539bb8ae0a999f3ea38f455ad5b1
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
new file mode 100644
index 000000000000..cc3f116634a8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.50/src/apache-tomcat-9.0.50-src.tar.gz
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=5c43d891ab52b7fab53f38a55644b1ce
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 8b790011a2e2..1eb002882920 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/libcgroup-0.41-r6 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
index 51edf2acfdf6..ce61dd02d25a 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
@@ -5,7 +5,7 @@ DESCRIPTION=Tools and libraries to configure and manage kernel control groups
 EAPI=7
 HOMEPAGE=http://libcg.sourceforge.net/
 IUSE=+daemon elibc_musl pam static-libs test +tools kernel_linux
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=pam? ( sys-libs/pam )
 REQUIRED_USE=daemon? ( tools )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88a1e73c74e3b843926315763435f343
+_md5_=814c2008ccdf504b5d47a66dc9baf9f7
diff --git a/metadata/md5-cache/dev-libs/libedit-20210419.3.1 b/metadata/md5-cache/dev-libs/libedit-20210419.3.1
index f9081ad974a9..8ac0fd69fdb9 100644
--- a/metadata/md5-cache/dev-libs/libedit-20210419.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20210419.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=BSD replacement for libreadline
 EAPI=7
 HOMEPAGE=https://thrysoee.dk/editline/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://thrysoee.dk/editline/libedit-20210419-3.1.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=744e26cba4cfc8690ecac25e9a4f5635
+_md5_=ba4ae693531a4b66fa6ec466fba63e5e
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.1.3 b/metadata/md5-cache/dev-libs/libfmt-7.1.3
index a90fd747b48d..7ec140d16953 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.1.3
+++ b/metadata/md5-cache/dev-libs/libfmt-7.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz -> libfmt-7.1.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fe8ec164843dab823c9f0f578883abb1
+_md5_=6e386f32999b9a5500468bd4aa251b2c
diff --git a/metadata/md5-cache/dev-libs/libretls-3.3.3 b/metadata/md5-cache/dev-libs/libretls-3.3.3
index fd05cbbdd86c..4b064c74b5f4 100644
--- a/metadata/md5-cache/dev-libs/libretls-3.3.3
+++ b/metadata/md5-cache/dev-libs/libretls-3.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=Port of libtls from LibreSSL to OpenSSL
 EAPI=7
 HOMEPAGE=https://git.causal.agency/libretls/about/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://causal.agency/libretls/libretls-3.3.3.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20831a98263ec3aadb1ae365753e86e3
+_md5_=12fd35f33a7a8347ea5200b11c4463ba
diff --git a/metadata/md5-cache/dev-libs/log4cplus-2.0.6 b/metadata/md5-cache/dev-libs/log4cplus-2.0.6
new file mode 100644
index 000000000000..e50a2aebcb70
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/log4cplus-2.0.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
+DESCRIPTION=C++ port of the Log for Java (log4j) logging library
+EAPI=7
+HOMEPAGE=http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus
+IUSE=explicit-initialization iconv qt5 server test threads
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( Apache-2.0 BSD-2 )
+RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/2.0.6/log4cplus-2.0.6.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e363506868faa5506bb009dfd4ff7060
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.17.3 b/metadata/md5-cache/dev-libs/protobuf-3.17.3
index b2ed49a28e8a..e5693e171753 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.17.3
+++ b/metadata/md5-cache/dev-libs/protobuf-3.17.3
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5bbeb74c5b1c328ba7e69bd15ec20ed6
+_md5_=967b6c49e9fd5852731a2a65950b2e79
diff --git a/metadata/md5-cache/dev-libs/re2-0.2021.06.01 b/metadata/md5-cache/dev-libs/re2-0.2021.06.01
index 794f7f5bfcb7..ac80cfdb1023 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2021.06.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2021.06.01
@@ -5,10 +5,10 @@ DESCRIPTION=An efficient, principled regular expression library
 EAPI=7
 HOMEPAGE=https://github.com/google/re2
 IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=icu? ( dev-libs/icu: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(-)?] )
 SLOT=0/9
 SRC_URI=https://github.com/google/re2/archive/2021-06-01.tar.gz -> re2-2021-06-01.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7de1ab5503b4c7b1bf167435f9c992a0
+_md5_=b61d8daadbfd1b7f82f1d36b37b8f532
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0-r2 b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
index 5ee8c7979959..b54e79c9c1ab 100644
--- a/metadata/md5-cache/dev-libs/tre-0.8.0-r2
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight, robust, and efficient POSIX compliant regexp matching l
 EAPI=6
 HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre/
 IUSE=nls static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/agrep !dev-ruby/amatch !app-misc/glimpse
 SLOT=0
 SRC_URI=https://laurikari.net/tre/tre-0.8.0.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f5bd3875117007cb0e9ec231ae01b444
+_md5_=1c6e0eb8f846e82a4777be4e092c1ae0
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index c45fe0d23151..d0375e947e7d 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1_rc4 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1_rc4
new file mode 100644
index 000000000000..8722b0af7f68
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1_rc4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-12.0.1_rc4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-12.0.1_rc4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1_rc4[llvm_targets_VE] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=0/12.0.1_rc4
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9f32d7a60ba66a1bdf97fe0df7a7b68e
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.2 b/metadata/md5-cache/dev-ml/uutf-1.0.2
new file mode 100644
index 000000000000..557b824c05cf
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-ml/ocamlbuild dev-ml/topkg test? ( dev-ml/cmdliner ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
+EAPI=7
+HOMEPAGE=https://erratique.ch/software/uutf
+IUSE=doc utftrip +ocamlopt test ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-lang/ocaml:=[ocamlopt?]
+REQUIRED_USE=utftrip? ( ocamlopt )
+RESTRICT=!test? ( test )
+SLOT=0/1.0.2
+SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz
+_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_md5_=61b6cb20b849e15f57d1bced9960df83
diff --git a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.5.0 b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.5.0
index 90cdf2b11779..bfe6c8190778 100644
--- a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.5.0
+++ b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Introspect overloaded operators
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-OverloadInfo
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/MRO-Compat >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ba56e9372482ff9f906e5a20317f69ed
+_md5_=78bfbb73a9e07b98a44e793b293b361c
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.290.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.290.0
index e3b03c9fd018..18348e8294e8 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.290.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.290.0
@@ -5,11 +5,11 @@ DESCRIPTION=Base class for Request/Response
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-Message
 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
+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=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp virtual/perl-Compress-Raw-Zlib >=virtual/perl-Encode-3.10.0 >=dev-perl/Encode-Locale-1.0.0 >=virtual/perl-Exporter-5.570.0 >=dev-perl/HTTP-Date-6.0.0 >=virtual/perl-IO-Compress-2.21.0 dev-perl/IO-HTML >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.100.0 >=dev-perl/URI-1.100.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.29.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ff92ba387f27cfb92d676fa924f88810
+_md5_=eb6af9cff30b046c5d8a9365c40b53c6
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index a7a70cedf995..7501471bb505 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-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 30c5f54bbfee..a33789ae182e 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/asttokens-2.0.5 b/metadata/md5-cache/dev-python/asttokens-2.0.5
index 8d08f465f50f..14c4753a32ca 100644
--- a/metadata/md5-cache/dev-python/asttokens-2.0.5
+++ b/metadata/md5-cache/dev-python/asttokens-2.0.5
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/astroid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/astroid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[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=Annotate Python AST trees with source text and token information
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/gristlabs/asttokens/ https://pypi.org/project/asttokens/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[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 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gristlabs/asttokens/archive/v2.0.5.tar.gz -> asttokens-2.0.5.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1b6fa5f3af986c3e228bd0aa34b41bc
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=20c77321335cc83865e0eb3f2830cdef
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.0 b/metadata/md5-cache/dev-python/cbor2-5.4.0
index 408d52757d58..c26686541630 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.4.0
+++ b/metadata/md5-cache/dev-python/cbor2-5.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
 EAPI=7
 HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 arm ~arm64 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.4.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3d9a38b14f400a226122b2cb21212d90
+_md5_=c65512ea54633191a913edce5f4b472e
diff --git a/metadata/md5-cache/dev-python/clang-python-12.0.1_rc4 b/metadata/md5-cache/dev-python/clang-python-12.0.1_rc4
new file mode 100644
index 000000000000..728c964b1778
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-12.0.1_rc4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-12.0.1_rc4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[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(-)?]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-12.0.1_rc4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/distlib-0.3.2 b/metadata/md5-cache/dev-python/distlib-0.3.2
index 55570a80fe74..b81356ae163c 100644
--- a/metadata/md5-cache/dev-python/distlib-0.3.2
+++ b/metadata/md5-cache/dev-python/distlib-0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level components of distutils2/packaging
 EAPI=7
 HOMEPAGE=https://pypi.org/project/distlib/ https://bitbucket.org/pypa/distlib/
 IUSE=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 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/pypa/distlib/get/0.3.2.tar.bz2 -> distlib-0.3.2.tar.bz2
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=27702da8cc4d2bbec73478f63ac3b897
+_md5_=a96d7f3d9eb70e63fafc929174a247eb
diff --git a/metadata/md5-cache/dev-python/django-taggit-1.5.1 b/metadata/md5-cache/dev-python/django-taggit-1.5.1
new file mode 100644
index 000000000000..14757cbdacb3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-taggit-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/djangorestframework[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple tagging for Django
+EAPI=8
+HOMEPAGE=https://github.com/jazzband/django-taggit
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/djangorestframework[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-taggit/django-taggit-1.5.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b6eb072e15e7a45535acbf8625e28f47
diff --git a/metadata/md5-cache/dev-python/executing-0.7.0 b/metadata/md5-cache/dev-python/executing-0.7.0
new file mode 100644
index 000000000000..89ec9533c78f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/executing-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Get information about what a Python frame is currently doing
+EAPI=8
+HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alexmojaki/executing/archive/v0.7.0.tar.gz -> executing-0.7.0.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=38e1955d4010af1bdada6449a0466c3c
diff --git a/metadata/md5-cache/dev-python/fonttools-4.24.4-r1 b/metadata/md5-cache/dev-python/fonttools-4.24.4-r1
index 16f80dd52a25..2d270c6bd3c2 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.24.4-r1
+++ b/metadata/md5-cache/dev-python/fonttools-4.24.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
 EAPI=7
 HOMEPAGE=https://github.com/fonttools/fonttools/
 IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/fs-2.4.9[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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.24.4.tar.gz -> fonttools-4.24.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=b2c92ffb1129c5a72549cf0c1355259b
+_md5_=2619168d15c3e5e82bcb8398acfc026e
diff --git a/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5 b/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5
index 2243f0788450..85bf81b9469f 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5
+++ b/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
 EAPI=7
 HOMEPAGE=https://github.com/aleaxit/gmpy
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= dev-libs/gmp: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_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=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.1.0b5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=85ce1f6c4a8016f312080bb55284f772
+_md5_=05c190b41d2b93eba952dd5ff4e4a627
diff --git a/metadata/md5-cache/dev-python/kombu-5.0.1 b/metadata/md5-cache/dev-python/kombu-5.0.1
index fd015ebddf75..c4068754c0e3 100644
--- a/metadata/md5-cache/dev-python/kombu-5.0.1
+++ b/metadata/md5-cache/dev-python/kombu-5.0.1
@@ -1,6 +1,6 @@
 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/importlib_metadata-0.18[python_targets_python3_8(-)?] >=dev-python/py-amqp-2.6.0[python_targets_python3_8(-)?] <dev-python/py-amqp-2.7[python_targets_python3_8(-)?] >=dev-python/pyro-4.76:4[python_targets_python3_8(-)?] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python3_8(-)?] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python3_8(-)?] ) mongodb? ( >=dev-python/pymongo-3.3.0[python_targets_python3_8(-)?] ) redis? ( >=dev-python/redis-py-3.3.11[python_targets_python3_8(-)?] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?] ) >=dev-python/setuptools-20.6.7[python_targets_python3_8(-)?] test? ( >=dev-python/case-1.5.2[python_targets_python3_8(-)?] <=dev-python/pytest-5.3.5[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] dev-python/unittest2[python_targets_python3_8(-)?] ) doc? ( dev-python/sphinx[python_targets_python3_8(-)?] >=dev-python/sphinx_celery-1.1[python_targets_python3_8(-)?] )
+DEPEND=>=dev-python/importlib_metadata-0.18[python_targets_python3_8(-)?] >=dev-python/py-amqp-2.6.0[python_targets_python3_8(-)?] <dev-python/py-amqp-2.7[python_targets_python3_8(-)?] >=dev-python/pyro-4.76:4[python_targets_python3_8(-)?] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python3_8(-)?] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python3_8(-)?] ) mongodb? ( >=dev-python/pymongo-3.3.0[python_targets_python3_8(-)?] ) redis? ( >=dev-python/redis-py-3.3.11[python_targets_python3_8(-)?] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?] ) >=dev-python/setuptools-20.6.7[python_targets_python3_8(-)?] test? ( >=dev-python/case-1.5.2[python_targets_python3_8(-)?] <=dev-python/pytest-5.3.5[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] ) doc? ( dev-python/sphinx[python_targets_python3_8(-)?] >=dev-python/sphinx_celery-1.1[python_targets_python3_8(-)?] )
 DESCRIPTION=AMQP Messaging Framework for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/kombu/ https://github.com/celery/kombu
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-5.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd63ae5489c4692001a4d5c2a2fad486
+_md5_=71c93bf049cf27bf3b17e839680d070d
diff --git a/metadata/md5-cache/dev-python/lit-12.0.1_rc4 b/metadata/md5-cache/dev-python/lit-12.0.1_rc4
new file mode 100644
index 000000000000..8e668331e545
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-12.0.1_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/llvm ) 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 unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
index ee981d9eed9e..68aa6e320ee3 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
@@ -1,9 +1,9 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,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/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?]
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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=Optional static typing for Python
 EAPI=7
 HOMEPAGE=http://www.mypy-lang.org/
-IUSE=test test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?]
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf2feb256b43ae24861cf9283b4eb5b0
+_md5_=73d32b09140d6ac02fb3076eab29147d
diff --git a/metadata/md5-cache/dev-python/netifaces-0.11.0 b/metadata/md5-cache/dev-python/netifaces-0.11.0
index 5e5469fe85c3..7df282e35949 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.11.0
+++ b/metadata/md5-cache/dev-python/netifaces-0.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=Portable network interface information
 EAPI=7
 HOMEPAGE=https://pypi.org/project/netifaces/ https://alastairs-place.net/projects/netifaces/ https://github.com/al45tair/netifaces
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.11.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3d4532245ef6dca0a6f5353b3f3efbc0
+_md5_=80f5feb87511fceb758ff2257ac8e820
diff --git a/metadata/md5-cache/dev-python/networkx-2.5 b/metadata/md5-cache/dev-python/networkx-2.5
index 453e94b4ed74..2f33490f9a76 100644
--- a/metadata/md5-cache/dev-python/networkx-2.5
+++ b/metadata/md5-cache/dev-python/networkx-2.5
@@ -4,7 +4,7 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=7
 HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx
 IUSE=examples extras pandas scipy test xml yaml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-4.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.5[python_targets_python3_8(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?] ) ) pandas? ( python_targets_python3_8? ( >=dev-python/pandas-0.23.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pandas-0.23.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) scipy? ( >=dev-python/scipy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[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? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=25356d2f7d674d8ef16b36a7457eebab
+_md5_=aa8763d9cf0465b49fe5f1899b2560cf
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.17.3 b/metadata/md5-cache/dev-python/protobuf-python-3.17.3
index 74b63823f4b4..0b77f183e971 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.17.3
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.3
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 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(-)?] ~dev-libs/protobuf-3.17.3 dev-python/namespace-google[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/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=18d522f017ccefdb1a36dd2738f730da
+_md5_=0121bafdee498ec3255c3fffc1d6bbe7
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.2 b/metadata/md5-cache/dev-python/pydot-1.4.2
index 5c4201263c2d..8ee4cc30d07f 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.2
+++ b/metadata/md5-cache/dev-python/pydot-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=7
 HOMEPAGE=https://github.com/pydot/pydot https://pypi.org/project/pydot/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz 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/pydot/pydot/archive/v1.4.2.tar.gz -> pydot-1.4.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77e68551281d1430a9d60930d703db57
+_md5_=74b961e4a2d3a6728efb7b5cdced7946
diff --git a/metadata/md5-cache/dev-python/pygobject-3.38.0 b/metadata/md5-cache/dev-python/pygobject-3.38.0
deleted file mode 100644
index 75d2bd93a2d4..000000000000
--- a/metadata/md5-cache/dev-python/pygobject-3.38.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python bindings for GObject Introspection
-EAPI=7
-HOMEPAGE=https://pygobject.readthedocs.io/
-IUSE=+cairo examples test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-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(-)?] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/cairo[glib] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/pygobject/3.38/pygobject-3.38.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c933674f3739202ad299b1d2f3212c2a
diff --git a/metadata/md5-cache/dev-python/pygobject-3.40.0 b/metadata/md5-cache/dev-python/pygobject-3.40.0
deleted file mode 100644
index 0e88aff831ad..000000000000
--- a/metadata/md5-cache/dev-python/pygobject-3.40.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python bindings for GObject Introspection
-EAPI=7
-HOMEPAGE=https://pygobject.readthedocs.io/
-IUSE=+cairo examples test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-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(-)?] >=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/cairo[glib] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/pygobject/3.40/pygobject-3.40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=918756dbd7877331eaebfd6352480e96
diff --git a/metadata/md5-cache/dev-python/pygobject-3.40.1 b/metadata/md5-cache/dev-python/pygobject-3.40.1
deleted file mode 100644
index e95248bfa861..000000000000
--- a/metadata/md5-cache/dev-python/pygobject-3.40.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python bindings for GObject Introspection
-EAPI=7
-HOMEPAGE=https://pygobject.readthedocs.io/
-IUSE=+cairo examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-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(-)?] >=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/cairo[glib] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/pygobject/3.40/pygobject-3.40.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c1737dd1ef81c27388d0320da2942dff
diff --git a/metadata/md5-cache/dev-python/pygobject-3.40.1-r1 b/metadata/md5-cache/dev-python/pygobject-3.40.1-r1
index 9f21f893222e..f78590e83f74 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.40.1-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.40.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for GObject Introspection
 EAPI=7
 HOMEPAGE=https://pygobject.readthedocs.io/
 IUSE=+cairo examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 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(-)?] >=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/cairo[glib] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.40/pygobject-3.40.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b026434b572fba8c331f73e2f45306ab
+_md5_=26900b043777ea3906f15b8dfab53291
diff --git a/metadata/md5-cache/dev-python/pymetar-1.1-r1 b/metadata/md5-cache/dev-python/pymetar-1.1-r1
index 2e59c855cff0..0ca7a0cefb29 100644
--- a/metadata/md5-cache/dev-python/pymetar-1.1-r1
+++ b/metadata/md5-cache/dev-python/pymetar-1.1-r1
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Downloads and decodes to the weather report for a given station ID
 EAPI=7
-HOMEPAGE=https://www.schwarzvogel.de/software-pymetar.shtml
+HOMEPAGE=https://www.schwarzvogel.de/software/pymetar/
 IUSE=python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=48e4f814ea5f90bfcbdf0c9286cf73a8
+_md5_=52a329fc7d784fafc957fef8b9fb85b6
diff --git a/metadata/md5-cache/dev-python/pymetar-1.2 b/metadata/md5-cache/dev-python/pymetar-1.2
index 051982d25df8..89bea881107f 100644
--- a/metadata/md5-cache/dev-python/pymetar-1.2
+++ b/metadata/md5-cache/dev-python/pymetar-1.2
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Downloads and decodes to the weather report for a given station ID
 EAPI=7
-HOMEPAGE=https://www.schwarzvogel.de/software-pymetar.shtml
+HOMEPAGE=https://www.schwarzvogel.de/software/pymetar/
 IUSE=python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6917416977eefa8122165962a32afa1
+_md5_=52a329fc7d784fafc957fef8b9fb85b6
diff --git a/metadata/md5-cache/dev-python/pymetar-1.2-r1 b/metadata/md5-cache/dev-python/pymetar-1.2-r1
index 502b23bdcdd7..393074f40d7a 100644
--- a/metadata/md5-cache/dev-python/pymetar-1.2-r1
+++ b/metadata/md5-cache/dev-python/pymetar-1.2-r1
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Downloads and decodes to the weather report for a given station ID
 EAPI=7
-HOMEPAGE=https://www.schwarzvogel.de/software-pymetar.shtml
+HOMEPAGE=https://www.schwarzvogel.de/software/pymetar/
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cbd97491e25a0f381a9bdcf053ce47f
+_md5_=d12756583fa50bfb8adcc46b15af235b
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.1 b/metadata/md5-cache/dev-python/pyside2-5.15.1
index 2cbd6e866dcc..dcb1d1f0fc2b 100644
--- a/metadata/md5-cache/dev-python/pyside2-5.15.1
+++ b/metadata/md5-cache/dev-python/pyside2-5.15.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 IUSE=3d charts concurrent datavis designer gles2-only +gui help location multimedia +network positioning printsupport qml quick script scripttools scxml sensors speech sql svg test testlib webchannel webengine websockets +widgets x11extras xml xmlpatterns python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
 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(-)?] >=dev-python/shiboken2-5.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5= dev-qt/qtopengl:5= dev-qt/qtserialport:5= 3d? ( >=dev-qt/qt3d-5.15:5[qml?] ) charts? ( >=dev-qt/qtcharts-5.15:5[qml?] ) concurrent? ( >=dev-qt/qtconcurrent-5.15:5 ) datavis? ( >=dev-qt/qtdatavis3d-5.15:5[qml?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only?] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[qml?,widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5[qml?] ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) qml? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) script? ( >=dev-qt/qtscript-5.15:5 ) scxml? ( >=dev-qt/qtscxml-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5[qml?] ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5[qml?] ) webengine? ( >=dev-qt/qtwebengine-5.15:5[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-5.15:5[qml?] ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xml? ( >=dev-qt/qtxml-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5[qml?] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) 3d? ( gui network ) charts? ( widgets ) datavis? ( gui ) designer? ( widgets xml ) gles2-only? ( gui ) help? ( widgets ) location? ( positioning ) multimedia? ( gui network ) printsupport? ( widgets ) qml? ( gui network ) quick? ( qml ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webengine? ( location quick widgets? ( gui network printsupport webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3400ab15f1baf5ef3ce9207a1344f913
+_md5_=a2b49c6eaf4c7bdaf7a1234530488137
diff --git a/metadata/md5-cache/dev-python/pyside2-tools-5.15.1-r1 b/metadata/md5-cache/dev-python/pyside2-tools-5.15.1-r1
index 2f7cf2159949..603eb076dd10 100644
--- a/metadata/md5-cache/dev-python/pyside2-tools-5.15.1-r1
+++ b/metadata/md5-cache/dev-python/pyside2-tools-5.15.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=PySide development tools (pyside2-lupdate with support for Python)
 EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/pyside2-5.15.1[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cd509b1b5431fe877cf2bce3872ec68d
+_md5_=3f8fdb9be91e60113903b8eef5fcfec1
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
deleted file mode 100644
index 06c0280cec82..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pytest[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/contextlib2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] dev-python/setuptools-git[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest[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/contextlib2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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=A goodie-bag of unix shell and environment tools for py.test
-EAPI=7
-HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/
-IUSE=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 ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/pytest[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/contextlib2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?]
-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/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54696f4161407a0fa2063931178d686f
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
new file mode 100644
index 000000000000..8b90f44450e9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pytest[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/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] dev-python/setuptools-git[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest[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/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] >=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.0: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=A goodie-bag of unix shell and environment tools for py.test
+EAPI=8
+HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/
+IUSE=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 ~s390 sparc x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/pytest[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/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?]
+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/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=63f0b39c9bf04dfd5ec947f1d64c174d
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1 b/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
index edfd598dd52e..07acbc93c80c 100644
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pyfakefs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pyfakefs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python based U2F host library
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/pyu2f/archive/0.1.4.tar.gz -> pyu2f-0.1.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cd398282fea99638b9e5288c0dbdb969
+_md5_=53a59fec510ab72b3a49884b0814fdb8
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8-r1 b/metadata/md5-cache/dev-python/raet-0.6.8-r1
index 22d2a0776c58..45fef28ef299 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8-r1
+++ b/metadata/md5-cache/dev-python/raet-0.6.8-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?] >=dev-python/ioflo-2.0[python_targets_python3_8(-)?] test? ( dev-python/msgpack[python_targets_python3_8(-)?] dev-python/unittest2[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(-)?]
+BDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?] >=dev-python/ioflo-2.0[python_targets_python3_8(-)?] test? ( dev-python/msgpack[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(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Reliable Asynchronous Event Transport Protocol
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9ca8c04dcaec6c1722bda850e760ee86
+_md5_=5d2e90c3fe9003b3cfd0a628ea9992c0
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8-r2 b/metadata/md5-cache/dev-python/raet-0.6.8-r2
index c340eec430ea..17ddd82716b0 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8-r2
+++ b/metadata/md5-cache/dev-python/raet-0.6.8-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/msgpack-1.0.0[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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Reliable Asynchronous Event Transport Protocol
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=de9193609e942c81c9ceefc17cc6b23b
+_md5_=d7db5e179f2f78a0b950f5c74b7a67a6
diff --git a/metadata/md5-cache/dev-python/regex-2021.7.6 b/metadata/md5-cache/dev-python/regex-2021.7.6
new file mode 100644
index 000000000000..efb6761cc4bd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2021.7.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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=Alternative regular expression module to replace re
+EAPI=8
+HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
+IUSE=doc test 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 ~x64-macos
+LICENSE=Apache-2.0
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/regex/regex-2021.7.6.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=131c19ef2ae44b61bf3683a44d39835c
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.1 b/metadata/md5-cache/dev-python/shiboken2-5.15.1
index 6e42ba34ba51..5f5b137f8f92 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.1
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding generator for C++ libraries
 EAPI=7
 HOMEPAGE=https://wiki.qt.io/PySide2
 IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
 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(-)?] >=dev-qt/qtcore-5.15:5 >=sys-devel/clang-6:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1156b70fb9a234baeb72bb9433612fa2
+_md5_=99446361dcc34559e5099e7c2023e4bc
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
index 192f9db23317..72c269a4ea54 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
@@ -1,7 +1,7 @@
-BDEPEND=test? ( dev-python/async_generator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/contextlib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/sphinx[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(-)?]
+BDEPEND=test? ( dev-python/async_generator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/sphinx[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=Make Sphinx better at documenting Python functions and methods
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/python-trio/sphinxcontrib-trio https://pypi.org/project/sphinxcontrib-trio
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8de59b509fff5fb8c6530a1ceadd006a
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2c605d31cbb9c87895f3c27ca714ac1
diff --git a/metadata/md5-cache/dev-python/subunit-1.4.0 b/metadata/md5-cache/dev-python/subunit-1.4.0
index a5df70366237..f328e83e92a5 100644
--- a/metadata/md5-cache/dev-python/subunit-1.4.0
+++ b/metadata/md5-cache/dev-python/subunit-1.4.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.4.0/+download/subunit-1.4.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f86612191072ff2ebbec9f9c4622a1e7
+_md5_=9cc5dca9ad6e611def2b54ea5581c1af
diff --git a/metadata/md5-cache/dev-python/testtools-2.4.0-r1 b/metadata/md5-cache/dev-python/testtools-2.4.0-r1
deleted file mode 100644
index 9ae2025ae731..000000000000
--- a/metadata/md5-cache/dev-python/testtools-2.4.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/extras-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-mimeparse[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrsistent[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traceback2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/unittest2-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) 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_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/fixtures-1.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testscenarios[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Extensions to the Python standard library unit testing framework
-EAPI=7
-HOMEPAGE=https://github.com/testing-cabal/testtools
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-PDEPEND=>=dev-python/fixtures-1.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-RDEPEND=>=dev-python/extras-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-mimeparse[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrsistent[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traceback2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/unittest2-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) 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_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/testtools/testtools-2.4.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8698adeb9d90dec9265c2d8565c31315
diff --git a/metadata/md5-cache/dev-python/testtools-2.4.0-r2 b/metadata/md5-cache/dev-python/testtools-2.4.0-r2
index 23440eb2f30c..c73529ae61bc 100644
--- a/metadata/md5-cache/dev-python/testtools-2.4.0-r2
+++ b/metadata/md5-cache/dev-python/testtools-2.4.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Extensions to the Python standard library unit testing framework
 EAPI=8
 HOMEPAGE=https://github.com/testing-cabal/testtools
 IUSE=doc 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 PDEPEND=>=dev-python/fixtures-1.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=>=dev-python/extras-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-mimeparse[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrsistent[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) 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_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-2.4.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d44cde3f9c1d51bd950fccd8c37902ed
+_md5_=851ade922b2745900943ddbc5fb8eb1f
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1 b/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
index 1af9cf6aaa23..4f27ceb05b98 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=WebSocket client and server library for Python 2 and 3 as well as PyPy
 EAPI=7
 HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=af06234eed68d10aedf8de8e895cf8d8
+_md5_=69b1fffdd1033f52a3454c695b2b018f
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
index 0c8a74b11615..23898f0aabe8 100644
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ b/metadata/md5-cache/dev-python/ws4py-9999
@@ -1,6 +1,6 @@
 BDEPEND=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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=WebSocket client and server library for Python 2 and 3 as well as PyPy
 EAPI=7
 HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e0af229c0323efb396ce7b3f959def2
+_md5_=145519f8172e60d7b7c665615e6a6104
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 05df715cb7cc..b26313354924 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.7 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
new file mode 100644
index 000000000000..26dc6b96cc6f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A pure Ruby DNS client library
+EAPI=7
+HOMEPAGE=https://github.com/alexdalitz/dnsruby
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/dnsruby-1.61.7.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c01f0d525892b9c4a9261f0318f14641
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.1 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.1
deleted file mode 100644
index 6d132907dc38..000000000000
--- a/metadata/md5-cache/dev-ruby/em-websocket-0.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby25(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=EventMachine based WebSocket server
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/em-websocket
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby25(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.1.tar.gz -> em-websocket-0.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d00281c7dc34d2a87bfcf0234710b0d
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.20.1 b/metadata/md5-cache/dev-ruby/fakefs-0.20.1
deleted file mode 100644
index 98311e1dfdc7..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.20.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=6
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v0.20.1.tar.gz -> fakefs-0.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a6b0d46d97d08402bebbafff5540065
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.1 b/metadata/md5-cache/dev-ruby/fakefs-1.2.1
deleted file mode 100644
index 80b4568fab4e..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=7
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.1.tar.gz -> fakefs-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f6f8b023240465ccf4cef96422cb9a9d
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.2 b/metadata/md5-cache/dev-ruby/fakefs-1.2.2
deleted file mode 100644
index aef8cc0fc010..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=7
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.2.tar.gz -> fakefs-1.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3da97511a8f8628caaa59a30c48a7a65
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.2 b/metadata/md5-cache/dev-ruby/globalid-0.4.2
deleted file mode 100644
index 9d3e5bec7860..000000000000
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby25(-)] >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby26(-)] >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Reference models by URI
-EAPI=6
-HOMEPAGE=https://github.com/rails/globalid
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rails/globalid/archive/v0.4.2.tar.gz -> globalid-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4676798cd1a1563ba152a298416e6673
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r1 b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r1
deleted file mode 100644
index ef69bd35cc38..000000000000
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby25(-)] >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby26(-)] >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby27(-)] >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Reference models by URI
-EAPI=7
-HOMEPAGE=https://github.com/rails/globalid
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rails/globalid/archive/v0.4.2.tar.gz -> globalid-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc64c0e734789915194479457984119c
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.0 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.0
deleted file mode 100644
index eaa657a46acc..000000000000
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25(-)] <dev-ruby/haml-6:*[ruby_targets_ruby25(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26(-)] <dev-ruby/haml-6:*[ruby_targets_ruby26(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Provides Haml generators for Rails 4
-EAPI=6
-HOMEPAGE=https://github.com/indirect/haml-rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25(-)] <dev-ruby/haml-6:*[ruby_targets_ruby25(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26(-)] <dev-ruby/haml-6:*[ruby_targets_ruby26(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/haml-rails-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df1125967542ee2fa4e28d28f970e3b6
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
index db94f9605aed..3c861e29c0d5 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25(-)] <dev-ruby/haml-6:*[ruby_targets_ruby25(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26(-)] <dev-ruby/haml-6:*[ruby_targets_ruby26(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25(-)] <dev-ruby/haml-6:*[ruby_targets_ruby25(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26(-)] <dev-ruby/haml-6:*[ruby_targets_ruby26(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby27(-)] <dev-ruby/haml-6:*[ruby_targets_ruby27(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Provides Haml generators for Rails 4
 EAPI=6
 HOMEPAGE=https://github.com/indirect/haml-rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25(-)] <dev-ruby/haml-6:*[ruby_targets_ruby25(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26(-)] <dev-ruby/haml-6:*[ruby_targets_ruby26(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25(-)] <dev-ruby/haml-6:*[ruby_targets_ruby25(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26(-)] <dev-ruby/haml-6:*[ruby_targets_ruby26(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby27(-)] <dev-ruby/haml-6:*[ruby_targets_ruby27(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/haml-rails-2.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd8d80781226dad5e3f1d94cb14f38d3
+_md5_=c2e3b092acd0eb86fef6e5ced378ce10
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.6.0 b/metadata/md5-cache/dev-ruby/hashie-3.6.0
index 791d797642be..1579dda3d145 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.6.0
+++ b/metadata/md5-cache/dev-ruby/hashie-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/activesupport[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/activesupport[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/activesupport[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/activesupport[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/activesupport[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
 EAPI=6
 HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/hashie-3.6.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dcddfe95176836fc815391bd8f883967
+_md5_=e2a1198cdd96c08b301057e89a7144f3
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.6.0 b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
index 765e7a7c6d11..609c3cf79e31 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.6.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/httparty[ruby_targets_ruby25(-)] dev-ruby/mimemagic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/httparty[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rr[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/webmock[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rr[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/httparty[ruby_targets_ruby25(-)] dev-ruby/mimemagic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/httparty[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/httparty[ruby_targets_ruby27(-)] dev-ruby/mimemagic[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rr[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/webmock[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rr[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rr[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Ruby library to interact with HipChat
 EAPI=6
 HOMEPAGE=https://github.com/hipchat/hipchat-rb
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/httparty[ruby_targets_ruby25(-)] dev-ruby/mimemagic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/httparty[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/httparty[ruby_targets_ruby25(-)] dev-ruby/mimemagic[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/httparty[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/httparty[ruby_targets_ruby27(-)] dev-ruby/mimemagic[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.6.0.tar.gz -> hipchat-1.6.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d817a3ff13de3d1404e029b4d40f408
+_md5_=8bfa286c6b248b1b7a4a6112a32fc56c
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
index 3ed0dd92516e..7661d4db224f 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby25(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby25(-)] dev-ruby/haml:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby26(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby26(-)] dev-ruby/haml:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby25(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby25(-)] dev-ruby/haml:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby26(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby26(-)] dev-ruby/haml:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby27(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby27(-)] dev-ruby/haml:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Convert HTML and HTML+Erb to Haml
 EAPI=6
 HOMEPAGE=https://github.com/haml/html2haml
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby25(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby25(-)] dev-ruby/haml:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby26(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby26(-)] dev-ruby/haml:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby25(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby25(-)] dev-ruby/haml:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby26(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby26(-)] dev-ruby/haml:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby27(-)] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby27(-)] dev-ruby/haml:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/html2haml-2.2.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9889b27318a9b4bd69c7890baf819f8
+_md5_=871ba9f8a8312f1d1a530db3dea9536d
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1 b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
new file mode 100644
index 000000000000..7ce14e8976b6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Liquid performance extension in C
+EAPI=7
+HOMEPAGE=https://github.com/Shopify/liquid-c
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://rubygems.org/gems/liquid-c-4.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c70734b745af216b9dc49ce64af669a
diff --git a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1 b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
new file mode 100644
index 000000000000..c5b585271a78
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby25(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby26(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby27(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Allows easy conversion from punycode ACE to unicode UTF-8 strings and vice-versa
+EAPI=7
+HOMEPAGE=https://github.com/mmriis/simpleidn
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby25(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby26(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby27(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mmriis/simpleidn/archive/v0.2.1.tar.gz -> simpleidn-0.2.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2bee486df6f1aa97598fe66402e16d99
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index eb0def94bda7..e9e30d95607b 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.5 b/metadata/md5-cache/dev-util/cmocka-1.1.5
index 8d151ba410c9..56d2b8006ec6 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.5
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.5
@@ -4,10 +4,10 @@ DESCRIPTION=Unit testing framework for C
 EAPI=7
 HOMEPAGE=https://cmocka.org/
 IUSE=doc examples 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=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=065581daa52a4f17308dd0db3a12869f
+_md5_=8be26517918cc666bbd552d3b90a8c93
diff --git a/metadata/md5-cache/dev-util/cucumber-3.2.0 b/metadata/md5-cache/dev-util/cucumber-3.2.0
index 8822482111d8..bb4a707ab13b 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-3.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=7
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby25(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1.3*:0[ruby_targets_ruby25(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby26(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1.3*:0[ruby_targets_ruby26(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby27(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1.3*:0[ruby_targets_ruby27(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.2.0.tar.gz -> cucumber-3.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	685587efe9ff6315b82811810827f69a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bbdf43449ee272ef68db08d8cd036b71
+_md5_=d5613176078492e006e8246eeab5c8c6
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.1_rc4 b/metadata/md5-cache/dev-util/lldb-12.0.1_rc4
new file mode 100644
index 000000000000..bda766479784
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-12.0.1_rc4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_8? ( ~dev-python/lit-12.0.1_rc4[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-12.0.1_rc4[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) sys-devel/lld ) 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] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[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] ) ) ~sys-devel/clang-12.0.1_rc4[xml] ~sys-devel/llvm-12.0.1_rc4 !<sys-devel/llvm-4.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+libedit lzma ncurses +python test test python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[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] ) ) ~sys-devel/clang-12.0.1_rc4[xml] ~sys-devel/llvm-12.0.1_rc4 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=48aacadb13e668ea200c9f59f7160aac
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-9.0.0 b/metadata/md5-cache/dev-util/mingw64-runtime-9.0.0
new file mode 100644
index 000000000000..1e8e361d220c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mingw64-runtime-9.0.0
@@ -0,0 +1,13 @@
+BDEPEND=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=compile configure install setup
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=7
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v9.0.0.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3b8a7fd58ed8b8b76996ebf6567fbe35
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 3a3997ef240d..9ec13a05d9ec 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/fossil-2.16 b/metadata/md5-cache/dev-vcs/fossil-2.16-r1
similarity index 73%
rename from metadata/md5-cache/dev-vcs/fossil-2.16
rename to metadata/md5-cache/dev-vcs/fossil-2.16-r1
index 04066ff76a13..82d65b184940 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.16
+++ b/metadata/md5-cache/dev-vcs/fossil-2.16-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.35.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= ) !tcl? ( || ( dev-lang/tcl:* dev-lang/jimtcl:* ) )
+DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.35.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) !tcl? ( || ( dev-lang/tcl:* dev-lang/jimtcl:* ) )
 DESCRIPTION=Simple, high-reliability, source control management, and more
 EAPI=7
 HOMEPAGE=https://www.fossil-scm.org/
-IUSE=debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
+IUSE=debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.35.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.35.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=ssl? ( !miniz )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://fossil-scm.org/home/tarball/7aedd5675883d4412cf20917d340b6985e3ecb842e88a39f135df034b2d5f4d3/fossil-src-2.16.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=270d58e8904b8c6c15e106edd4d02742
+_md5_=2018bc2f54b2100240c98ef26e79f0cb
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index df112ec92981..09def210037c 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/gnuchess-6.2.8-r1 b/metadata/md5-cache/games-board/gnuchess-6.2.8-r1
index 943b38661171..2557031c1c01 100644
--- a/metadata/md5-cache/games-board/gnuchess-6.2.8-r1
+++ b/metadata/md5-cache/games-board/gnuchess-6.2.8-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=Console based chess interface
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/chess/chess.html
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/chess/gnuchess-6.2.8.tar.gz
-_md5_=dc186fab1515d40f5ac8f65092a23d62
+_md5_=16673646f191521e35b5de38d588c1e6
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index ade81fd98637..2797a594ad20 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.75.1-r1 b/metadata/md5-cache/games-emulation/dosbox-staging-0.75.1-r1
deleted file mode 100644
index 99809e188994..000000000000
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.75.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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
-DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) opus? ( media-libs/opusfile ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] sys-libs/zlib !games-emulation/dosbox
-DESCRIPTION=Modernized DOSBox soft-fork
-EAPI=7
-HOMEPAGE=https://dosbox-staging.github.io/
-IUSE=alsa debug dynrec network opengl opus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) opus? ( media-libs/opusfile ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] sys-libs/zlib !games-emulation/dosbox
-SLOT=0
-SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.75.1.tar.gz -> dosbox-staging-0.75.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bb96c0c23121f457c2ba493f857af69b
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.75.1-r2 b/metadata/md5-cache/games-emulation/dosbox-staging-0.75.1-r2
deleted file mode 100644
index b3f9037c4c17..000000000000
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.75.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 postinst postrm preinst prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) opus? ( media-libs/opusfile ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] sys-libs/zlib !games-emulation/dosbox dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modernized DOSBox soft-fork
-EAPI=7
-HOMEPAGE=https://dosbox-staging.github.io/
-IUSE=alsa debug dynrec network opengl opus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) opus? ( media-libs/opusfile ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] sys-libs/zlib !games-emulation/dosbox
-SLOT=0
-SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.75.1.tar.gz -> dosbox-staging-0.75.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d76c514c4536bce95b01884e6ccc050
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.75.2 b/metadata/md5-cache/games-emulation/dosbox-staging-0.75.2
deleted file mode 100644
index 78d4593ac874..000000000000
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.75.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 postinst postrm preinst prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) opus? ( media-libs/opusfile ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] sys-libs/zlib !games-emulation/dosbox dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modernized DOSBox soft-fork
-EAPI=7
-HOMEPAGE=https://dosbox-staging.github.io/
-IUSE=alsa debug dynrec network opengl opus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) opus? ( media-libs/opusfile ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] sys-libs/zlib !games-emulation/dosbox
-SLOT=0
-SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.75.2.tar.gz -> dosbox-staging-0.75.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3031ba1dca6b14709363df2de495f024
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.77.0 b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.0
new file mode 100644
index 000000000000..9aa1727fbf72
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile sys-libs/zlib !games-emulation/dosbox dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modernized DOSBox soft-fork
+EAPI=7
+HOMEPAGE=https://dosbox-staging.github.io/
+IUSE=+alsa debug dynrec +fluidsynth mt-32 network opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile sys-libs/zlib !games-emulation/dosbox
+SLOT=0
+SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.77.0.tar.gz -> dosbox-staging-0.77.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f82bd0df3c3b952e6d551f6850e932b8
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.11.3_p20210627 b/metadata/md5-cache/games-emulation/ppsspp-1.11.3_p20210627
new file mode 100644
index 000000000000..efcf484070a9
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.11.3_p20210627
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:= sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[opengl,sound,video] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A PSP emulator written in C++
+EAPI=7
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=discord qt5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 JSON MIT
+RDEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:= sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[opengl,sound,video] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/ff2a6eeda2d00210f1a1f7bc0ab0ad99e7bc60b6.tar.gz -> ppsspp-1.11.3_p20210627.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.tar.gz -> ppsspp-1.11.3_p20210627-ext_SPIRV-Cross.tar.gz https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ppsspp-1.11.3_p20210627-ext_armips.tar.gz https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ppsspp-1.11.3_p20210627-ext_rapidjson.tar.gz https://github.com/facebook/zstd/archive/56421f34e4ab5c17cbac0832bd12413e4f27ecf9.tar.gz -> ppsspp-1.11.3_p20210627-ext_zstd.tar.gz https://github.com/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ppsspp-1.11.3_p20210627-ext_glslang.tar.gz https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ppsspp-1.11.3_p20210627-ext_miniupnp.tar.gz https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ppsspp-1.11.3_p20210627-ext_native_tools_prebuilt.tar.gz https://github.com/hrydgard/ppsspp-lang/archive/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ppsspp-1.11.3_p20210627-assets_lang.tar.gz discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ppsspp-1.11.3_p20210627-ext_discord-rpc.tar.gz )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a9e081a5a556fd43c7b5552c86553853
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 18d21de8c0f3..407b915d1ef9 100644
Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/draci-historie-2012-r1 b/metadata/md5-cache/games-rpg/draci-historie-2012-r1
index 81bcfabafdb3..8b78a86ae3ef 100644
--- a/metadata/md5-cache/games-rpg/draci-historie-2012-r1
+++ b/metadata/md5-cache/games-rpg/draci-historie-2012-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install unpack
 DESCRIPTION=Bert the little dragon searches for his father
-EAPI=6
-HOMEPAGE=http://www.ucw.cz/draci-historie/index-en.html
-IUSE=l10n_cs l10n_de l10n_en l10n_pl
+EAPI=8
+HOMEPAGE=https://www.ucw.cz/draci-historie/index-en.html
+IUSE=l10n_cs l10n_de +l10n_en l10n_pl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=games-engines/scummvm-1.1
+RDEPEND=games-engines/scummvm
 SLOT=0
-SRC_URI=l10n_cs? ( http://www.ucw.cz/draci-historie/binary/dh-cz-2012.zip ) l10n_de? ( http://www.ucw.cz/draci-historie/binary/dh-de-2012.zip ) l10n_en? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-pl-2012.zip ) !l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) ) ) )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c76305c25b86f236b461de018bf13f56
+SRC_URI=l10n_cs? ( https://www.ucw.cz/draci-historie/binary/dh-cz-2012.zip ) l10n_de? ( https://www.ucw.cz/draci-historie/binary/dh-de-2012.zip ) l10n_en? ( https://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) l10n_pl? ( https://www.ucw.cz/draci-historie/binary/dh-pl-2012.zip ) !l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( https://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) ) ) ) https://dev.gentoo.org/~ionen/distfiles/draci-historie.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1ebbc5f1ead5bb6edbf52347eb34fa7b
diff --git a/metadata/md5-cache/games-rpg/drascula-1.0-r3 b/metadata/md5-cache/games-rpg/drascula-1.0-r3
deleted file mode 100644
index 430ff77ef63b..000000000000
--- a/metadata/md5-cache/games-rpg/drascula-1.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=games-engines/scummvm-0.13.1 app-arch/unzip
-DESCRIPTION=Drascula: The Vampire Strikes Back
-EAPI=6
-HOMEPAGE=http://www.alcachofasoft.com/
-IUSE=l10n_es l10n_de l10n_fr l10n_it +sound
-KEYWORDS=~amd64 ~x86
-LICENSE=drascula
-RDEPEND=>=games-engines/scummvm-0.13.1
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/scummvm/drascula-1.0.zip https://github.com/scummvm/scummvm/raw/v2.0.0/dists/engine-data/drascula.dat -> drascula-2.0.0.dat sound? ( mirror://sourceforge/scummvm/drascula-audio-2.0.zip ) https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png l10n_es? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_de? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a358e5c03ec6b98a9759e6724bfffb4
diff --git a/metadata/md5-cache/games-rpg/drascula-1.0-r4 b/metadata/md5-cache/games-rpg/drascula-1.0-r4
new file mode 100644
index 000000000000..331bf1038d46
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/drascula-1.0-r4
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install unpack
+DESCRIPTION=Drascula: The Vampire Strikes Back
+EAPI=8
+HOMEPAGE=http://www.alcachofasoft.com/
+IUSE=l10n_es l10n_de l10n_fr l10n_it +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=drascula
+RDEPEND=games-engines/scummvm[vorbis]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://sourceforge/scummvm/drascula-1.0.zip https://github.com/scummvm/scummvm/raw/v2.2.0/dists/engine-data/drascula.dat -> drascula-2.2.0.dat sound? ( mirror://sourceforge/scummvm/drascula-audio-2.0.zip ) https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png l10n_es? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_de? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1eb5ab075ed91bb0ec83853ae6cd4639
diff --git a/metadata/md5-cache/games-rpg/dreamweb-1.1-r1 b/metadata/md5-cache/games-rpg/dreamweb-1.1-r1
index bb7dc7287679..5cb01f5cfa2e 100644
--- a/metadata/md5-cache/games-rpg/dreamweb-1.1-r1
+++ b/metadata/md5-cache/games-rpg/dreamweb-1.1-r1
@@ -1,13 +1,13 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Top-down adventure game set in a gritty futuristic/dystopian city
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.scummvm.org/index.php/Dreamweb
-IUSE=doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it
+IUSE=doc l10n_de +l10n_en l10n_en-GB l10n_es l10n_fr l10n_it
 KEYWORDS=~amd64 ~x86
 LICENSE=Dreamweb
-RDEPEND=>=games-engines/scummvm-1.7[flac]
+RDEPEND=games-engines/scummvm[flac]
 SLOT=0
 SRC_URI=doc? ( mirror://sourceforge/scummvm/dreamweb-manuals-en-highres.zip ) l10n_de? ( mirror://sourceforge/scummvm/dreamweb-cd-de-1.1.zip ) l10n_en? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) l10n_en-GB? ( mirror://sourceforge/scummvm/dreamweb-cd-uk-1.1.zip ) l10n_es? ( mirror://sourceforge/scummvm/dreamweb-cd-es-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/dreamweb-cd-fr-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-it-1.1.zip ) !l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) ) ) ) ) ) http://www.scummvm.org/images/cat-dreamweb.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2aedd145174ce2a37c23fbf16e6298e0
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=264743f106d248e47c1039e5bf3b3f7f
diff --git a/metadata/md5-cache/games-rpg/gwiz-0.8-r1 b/metadata/md5-cache/games-rpg/gwiz-0.8-r1
index e7bb7905b4f4..7652b0b97a51 100644
--- a/metadata/md5-cache/games-rpg/gwiz-0.8-r1
+++ b/metadata/md5-cache/games-rpg/gwiz-0.8-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libsdl-1.2.3[joystick,video] >=media-libs/sdl-image-1.2.1-r1[png] >=media-libs/sdl-ttf-2.0.4
-DESCRIPTION=clone of old-school Wizardry(tm) games by SirTech
-EAPI=6
-HOMEPAGE=http://icculus.org/gwiz/
+DEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf
+DESCRIPTION=Clone of old-school Wizardry(tm) games by SirTech
+EAPI=8
+HOMEPAGE=https://icculus.org/gwiz/
 KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2.3[joystick,video] >=media-libs/sdl-image-1.2.1-r1[png] >=media-libs/sdl-ttf-2.0.4
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf
 SLOT=0
-SRC_URI=http://icculus.org/gwiz/gwiz-0.8.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=847a400a1b7f0db12e2f2b7f9dc9636d
+SRC_URI=https://icculus.org/gwiz/gwiz-0.8.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b56f3b1439ca0e45a11ef84573181287
diff --git a/metadata/md5-cache/games-rpg/soltys-1.0-r2 b/metadata/md5-cache/games-rpg/soltys-1.0-r2
index b45d3317f655..048ebe3ce5de 100644
--- a/metadata/md5-cache/games-rpg/soltys-1.0-r2
+++ b/metadata/md5-cache/games-rpg/soltys-1.0-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install unpack
 DESCRIPTION=Classic adventure game
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.scummvm.org/index.php/Soltys
 IUSE=l10n_en l10n_es l10n_pl
 KEYWORDS=~amd64 ~x86
 LICENSE=Soltys
-RDEPEND=>=games-engines/scummvm-1.5
+RDEPEND=games-engines/scummvm
 SLOT=0
 SRC_URI=l10n_en? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) l10n_es? ( mirror://sourceforge/scummvm/soltys-es-v1.0.zip ) l10n_pl? ( mirror://sourceforge/scummvm/soltys-pl-v1.0.zip ) !l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) ) ) http://www.scummvm.org/images/cat-soltys.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ede00c999856238b6c60d4795b1e20ea
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=50af07cba937359c5355e218ce48c7dd
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index d367d1c4d67e..92f484b42f11 100644
Binary files a/metadata/md5-cache/gui-apps/Manifest.gz and b/metadata/md5-cache/gui-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-apps/mako-1.4.1 b/metadata/md5-cache/gui-apps/mako-1.4.1
deleted file mode 100644
index adf3ed7cd3f1..000000000000
--- a/metadata/md5-cache/gui-apps/mako-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-text/scdoc-1.9.7 >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf )
-DESCRIPTION=A lightweight notification daemon for Wayland. Works on Sway.
-EAPI=7
-HOMEPAGE=https://github.com/emersion/mako
-IUSE=+icons
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf ) dev-libs/wayland-protocols
-SLOT=0
-SRC_URI=https://github.com/emersion/mako/archive/v1.4.1.tar.gz -> mako-1.4.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f375e4381c9185e3fc9e47b788d8577
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 3acc0f79707d..d7c3cb568d6d 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0 b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
index c9531c9bfe95..112ebf658fe8 100644
--- a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
+++ b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=xdg-desktop-portal backend for wlroots
 EAPI=7
 HOMEPAGE=https://github.com/emersion/xdg-desktop-portal-wlr
 IUSE=elogind systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 ) sys-apps/xdg-desktop-portal
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/9999
 SRC_URI=https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.4.0/xdg-desktop-portal-wlr-0.4.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=252c1079d19bffca172c0e80a9750722
+_md5_=f285d619e867f32b26b36bfa1d661beb
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 20e23a57aae3..1ebdc2abe780 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/courier-1.1.2 b/metadata/md5-cache/mail-mta/courier-1.1.2
index d0c1bbd42fa6..4ec1b10641d5 100644
--- a/metadata/md5-cache/mail-mta/courier-1.1.2
+++ b/metadata/md5-cache/mail-mta/courier-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=An MTA designed specifically for maildirs
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/
 IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3
 PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.71.2 >=net-libs/courier-unicode-2.2.3 net-dns/libidn:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-1.1.2.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=33bbcdb27a01794ebde70bf71debc8b0
+_md5_=a9902b42a38c7d0a0eb469529b3a584e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 16d8b6d75570..778612f442f7 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/hydrus-442 b/metadata/md5-cache/media-gfx/hydrus-442
index 8542c63995eb..13e27c7a85e5 100644
--- a/metadata/md5-cache/media-gfx/hydrus-442
+++ b/metadata/md5-cache/media-gfx/hydrus-442
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) )
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
 DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v442.tar.gz -> hydrus-442.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=588d361fb1b0fbbf1f38c6307cfa9207
+_md5_=c8098b10f6cb0d9f8da27fb7bb6ffa05
diff --git a/metadata/md5-cache/media-gfx/hydrus-443 b/metadata/md5-cache/media-gfx/hydrus-443
index 03000359689b..4197ca6ba4b0 100644
--- a/metadata/md5-cache/media-gfx/hydrus-443
+++ b/metadata/md5-cache/media-gfx/hydrus-443
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) )
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
 DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v443.tar.gz -> hydrus-443.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c45cedfaed19780f88d341bbd346b7cd
+_md5_=6d687f8f383ca354c4c06c58b43a8227
diff --git a/metadata/md5-cache/media-gfx/hydrus-444 b/metadata/md5-cache/media-gfx/hydrus-444
index 82bd39ea54de..070b052dfd44 100644
--- a/metadata/md5-cache/media-gfx/hydrus-444
+++ b/metadata/md5-cache/media-gfx/hydrus-444
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) )
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
 DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v444.tar.gz -> hydrus-444.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c45cedfaed19780f88d341bbd346b7cd
+_md5_=6d687f8f383ca354c4c06c58b43a8227
diff --git a/metadata/md5-cache/media-gfx/hydrus-445 b/metadata/md5-cache/media-gfx/hydrus-445
index 08418bd32804..1193005e185b 100644
--- a/metadata/md5-cache/media-gfx/hydrus-445
+++ b/metadata/md5-cache/media-gfx/hydrus-445
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) )
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
 DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v445.tar.gz -> hydrus-445.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=652619895aa8caf12d59bb3646a4b1fa
+_md5_=b69fd34f075ffcc23453976f6ffb4c92
diff --git a/metadata/md5-cache/media-gfx/hydrus-9999 b/metadata/md5-cache/media-gfx/hydrus-9999
index e12c507f7789..378d6a440444 100644
--- a/metadata/md5-cache/media-gfx/hydrus-9999
+++ b/metadata/md5-cache/media-gfx/hydrus-9999
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare setup test unpack
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=652619895aa8caf12d59bb3646a4b1fa
+_md5_=b69fd34f075ffcc23453976f6ffb4c92
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index da4ab60800c0..062419643604 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/game-music-emu-0.6.3 b/metadata/md5-cache/media-libs/game-music-emu-0.6.3
index 603dfa313a22..2179e0253101 100644
--- a/metadata/md5-cache/media-libs/game-music-emu-0.6.3
+++ b/metadata/md5-cache/media-libs/game-music-emu-0.6.3
@@ -4,9 +4,9 @@ DESCRIPTION=Video game music file emulators
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mpyne/game-music-emu/wiki/Home
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8fb6d0f6b94abee224f5df25fa5b5d6c
+_md5_=9e1bba26d14cb26974bb0256c4ad0147
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
index f78217a583e5..5148808026b3 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
 EAPI=7
 HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
 IUSE=cpu_flags_arm_neon java static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD IJG ZLIB
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1e7e53b483c46b23bfaaa0d6387d88dd
+_md5_=5913348d2cc52fc0e5cdac2a74d30afd
diff --git a/metadata/md5-cache/media-libs/liblscp-0.9.4 b/metadata/md5-cache/media-libs/liblscp-0.9.4
new file mode 100644
index 000000000000..ce27b05720d1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/liblscp-0.9.4
@@ -0,0 +1,11 @@
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DESCRIPTION=C++ library for the Linux Sampler control protocol
+EAPI=7
+HOMEPAGE=https://www.linuxsampler.org
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://www.rncbc.org/archive/liblscp-0.9.4.tar.gz https://download.linuxsampler.org/packages/liblscp-0.9.4.tar.gz
+_md5_=b4c925c84e874f2a07f047d0ad53dc55
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 56674e1bee29..9c9e2f742921 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-1.21.4 b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-1.21.4
new file mode 100644
index 000000000000..a4f1bebf8267
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-1.21.4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
+DESCRIPTION=Kodi's FFMpeg Direct Inputstream addon
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/inputstream.ffmpegdirect
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
+SLOT=0
+SRC_URI=https://github.com/xbmc/inputstream.ffmpegdirect/archive/1.21.4-Matrix.tar.gz -> kodi-inputstream-ffmpegdirect-1.21.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b440038342814d735aa90471220ffaa0
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-1.21.5 b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-1.21.5
new file mode 100644
index 000000000000..fcb6f6e74591
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-1.21.5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
+DESCRIPTION=Kodi's FFMpeg Direct Inputstream addon
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/inputstream.ffmpegdirect
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
+SLOT=0
+SRC_URI=https://github.com/xbmc/inputstream.ffmpegdirect/archive/1.21.5-Matrix.tar.gz -> kodi-inputstream-ffmpegdirect-1.21.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b440038342814d735aa90471220ffaa0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2
new file mode 100644
index 000000000000..61ad36039eeb
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+DESCRIPTION=Kodi's ARGUS TV client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/7.1.2-Matrix.tar.gz -> kodi-pvr-argustv-7.1.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7fa9b9e33616a2eae5c74104806777b1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.1 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.1
new file mode 100644
index 000000000000..7688170ee8ac
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19*
+DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19*
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.3.1-Matrix.tar.gz -> kodi-pvr-hts-8.3.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.5
new file mode 100644
index 000000000000..c9baf9b0f120
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.5
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
+DESCRIPTION=Kodi's VuPlus client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.5-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index b760e16cbe9b..ed61984627a9 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.1 b/metadata/md5-cache/media-sound/fluidsynth-2.2.1
index e9f5d445ed7f..5f528ecba1fd 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.1
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specificatio
 EAPI=7
 HOMEPAGE=https://www.fluidsynth.org
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib: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(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[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-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline: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(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/3
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.1.tar.gz -> fluidsynth-2.2.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1e2224569ae1bbda04bcf2b12649cbde
+_md5_=0167b578cf73ada2ffa7a57e31085965
diff --git a/metadata/md5-cache/media-sound/qsampler-0.9.4 b/metadata/md5-cache/media-sound/qsampler-0.9.4
new file mode 100644
index 000000000000..0d4a20a580dd
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qsampler-0.9.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical frontend to the LinuxSampler engine
+EAPI=7
+HOMEPAGE=https://qsampler.sourceforge.io/ https://www.linuxsampler.org/
+IUSE=debug +libgig
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) media-sound/linuxsampler
+SLOT=0
+SRC_URI=mirror://sourceforge/qsampler/0.9.4/qsampler-0.9.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2d81b3cf55358cbee0799b0f023eff28
diff --git a/metadata/md5-cache/media-sound/qsynth-0.9.4 b/metadata/md5-cache/media-sound/qsynth-0.9.4
new file mode 100644
index 000000000000..5b09f2f29d0a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qsynth-0.9.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt application to control FluidSynth
+EAPI=7
+HOMEPAGE=https://qsynth.sourceforge.io/
+IUSE=+alsa debug jack pulseaudio
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+REQUIRED_USE=|| ( alsa jack pulseaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/qsynth/qsynth-0.9.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=78fc984d2a7ee904a1e547e261786fec
diff --git a/metadata/md5-cache/media-sound/rosegarden-21.06 b/metadata/md5-cache/media-sound/rosegarden-21.06
index 164a2c0e3956..79e6a13a8dcd 100644
--- a/metadata/md5-cache/media-sound/rosegarden-21.06
+++ b/metadata/md5-cache/media-sound/rosegarden-21.06
@@ -5,11 +5,11 @@ DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=7
 HOMEPAGE=https://www.rosegardenmusic.com/
 IUSE=lirc test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-21.06.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e40e58666186a16515be9638b20dc209
+_md5_=ea4cd95492a4e6d9d89c18ed0a7f75dc
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.56 b/metadata/md5-cache/media-sound/spotify-1.1.56
index 791a759e59a6..f07afdeff54f 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.56
+++ b/metadata/md5-cache/media-sound/spotify-1.1.56
@@ -5,11 +5,11 @@ DESCRIPTION=Spotify is a social music platform
 EAPI=7
 HOMEPAGE=https://www.spotify.com/download/linux/
 IUSE=libnotify local-playback pax-kernel pulseaudio systray
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Spotify
 RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) local-playback? ( media-video/ffmpeg:0/56.58.58 ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libxkbcommon x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libSM x11-libs/libICE
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.56.595.g2d2da0de_amd64.deb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7323431be465285079d0d2b1aefa3199
+_md5_=f9e46d7a819df2f8048e3881aa96bf98
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 75a728af11f8..c401b01ecfc0 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vcsi-7-r1 b/metadata/md5-cache/media-video/vcsi-7-r2
similarity index 54%
rename from metadata/md5-cache/media-video/vcsi-7-r1
rename to metadata/md5-cache/media-video/vcsi-7-r2
index 5f6c51d6dabf..0d090658ab0b 100644
--- a/metadata/md5-cache/media-video/vcsi-7-r1
+++ b/metadata/md5-cache/media-video/vcsi-7-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-video/ffmpeg >=dev-python/nose-1.3.7-r4[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(-)?]
+BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,truetype,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-video/ffmpeg >=dev-python/nose-1.3.7-r4[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=Create thumbnail sheets from video files
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/amietn/vcsi
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-video/ffmpeg 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(-)?]
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,truetype,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-video/ffmpeg 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/amietn/vcsi/archive/v7.tar.gz -> vcsi-7.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5104081ca8fda56e36d5273a4fab5c88
+_md5_=ee185fdab615aa343f9c8428359d90b5
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 3cfc496ca008..99241f96acc1 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/mgetty-1.2.1-r3 b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r3
index 5414e2fd56eb..f6a04ec9c9c2 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r3
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A programm for sending and receiving fax and voice
 EAPI=7
 HOMEPAGE=http://mgetty.greenie.net/
 IUSE=+fax fidonet 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=GPL-2
 RDEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo virtual/awk fax? ( !net-misc/efax ) acct-group/fax acct-user/fax fax? ( app-text/ghostscript-gpl media-libs/netpbm )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5874cbcc49afdd007293adaa6a40b1e0
+_md5_=0387742493e0eb20467e1aff118a2a0e
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 556173d0bb93..dc52143116eb 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/ipt_netflow-2.5.1-r1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
deleted file mode 100644
index f1d76ec52737..000000000000
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/linux-sources virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Netflow iptables module
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
-IUSE=debug natevents snmp kernel_linux kernel_linux kernel_linux dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.5.1.tar.gz -> ipt_netflow-2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f4dc55d3e279bd36a5334d3e22d783c
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.6 b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
index 556b5b631d67..c953f7f82f00 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.6
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
@@ -5,10 +5,10 @@ DESCRIPTION=Netflow iptables module
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
 IUSE=debug natevents snmp kernel_linux kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.6.tar.gz -> ipt_netflow-2.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bd07576391bbba791fe2720b65caec4
+_md5_=89b0918337a2a84b07332ac17c770527
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 3bf489b0d918..d37fa77ed3ac 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.4.1 b/metadata/md5-cache/net-im/signal-desktop-bin-5.7.1
similarity index 97%
rename from metadata/md5-cache/net-im/signal-desktop-bin-5.4.1
rename to metadata/md5-cache/net-im/signal-desktop-bin-5.7.1
index 4c614d0b2129..658d9987b5f4 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.4.1
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.7.1
@@ -9,6 +9,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon 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/libXScrnSaver x11-libs/libXtst x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.4.1_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.7.1_amd64.deb
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7650c4c46a42fcdff79211543fc0530e
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 081b235f0043..6110bc3ffef8 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/polari-40.0 b/metadata/md5-cache/net-irc/polari-40.0
new file mode 100644
index 000000000000..dfd0b4eb5446
--- /dev/null
+++ b/metadata/md5-cache/net-irc/polari-40.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( dev-lang/spidermonkey:78 dev-libs/json-glib ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.67.2 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An IRC client for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.67.2 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/polari/40/polari-40.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=707438f66485c715502fbce50756efd2
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b4fc8e56e9eb..0f1d5d33a0a6 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/courier-authlib-0.71.2-r2 b/metadata/md5-cache/net-libs/courier-authlib-0.71.2-r2
index d3b20e9d2201..97d51cc944f6 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.71.2-r2
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.71.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
-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=GPL-3
 RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.3 virtual/libcrypt:= gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.71.2.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc57e0f915fe92b0ee43a9b189374d7a
+_md5_=9d61582678a927fc4e0a6f2dbe1b5b6b
diff --git a/metadata/md5-cache/net-libs/courier-unicode-2.2.3 b/metadata/md5-cache/net-libs/courier-unicode-2.2.3
index aed07cc1930d..98173d9a5915 100644
--- a/metadata/md5-cache/net-libs/courier-unicode-2.2.3
+++ b/metadata/md5-cache/net-libs/courier-unicode-2.2.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Unicode library used by the courier mail server
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/
-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=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-unicode-2.2.3.tar.bz2
-_md5_=ec53c4a947ff5c139498a7d6b0e2be77
+_md5_=f6a13bf763c4eb456ea4c8348641a5e1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 43c51f0d74bf..0ef8bfef07af 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/netkit-rsh-0.17-r14 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r14
index 63b2c256f567..17ea27ec3cc4 100644
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r14
+++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r14
@@ -5,10 +5,10 @@ DESCRIPTION=Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}
 EAPI=7
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 IUSE=pam +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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=BSD
 RDEPEND=sys-libs/ncurses:= virtual/libcrypt:= pam? ( >=sys-auth/pambase-20080219.1 ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz mirror://gentoo/rexec-1.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dcbeb950f0cd5ae8e0ed2a09a3781165
+_md5_=77a52b300279758db9c2feabf71647ae
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.2 b/metadata/md5-cache/net-misc/networkmanager-1.32.2
new file mode 100644
index 000000000000..0af32bd77f0c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.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(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.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(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.2.tar.xz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	03f1f33473c1c770f4bffe2e342cd1df	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c173e2a7ee8792e0d9976f27841f6936
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 3c0c028dbdd1..1fc238a037ff 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/blueman-2.2.1 b/metadata/md5-cache/net-wireless/blueman-2.2.1
index 03ae32f10d4c..3d892c1283b5 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.2.1
+++ b/metadata/md5-cache/net-wireless/blueman-2.2.1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
 EAPI=7
 HOMEPAGE=https://github.com/blueman-project/blueman
 IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-3+ GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) >=net-wireless/bluez-5:= 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/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.2.1/blueman-2.2.1.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=242c8c3eda3c0293c1d912e5229b8a11
+_md5_=ed2648ff716788e3f780f67c2e1eda51
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index e75927f76fa0..d97331e43cc8 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/gdal-3.3.1 b/metadata/md5-cache/sci-libs/gdal-3.3.1
new file mode 100644
index 000000000000..1778976df674
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core dev-lang/swig:0 >=virtual/jdk-1.8:* ) perl? ( dev-lang/swig:0 ) python? ( dev-lang/swig:0 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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=compile configure install postinst preinst prepare setup test
+DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( 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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
+EAPI=7
+HOMEPAGE=https://gdal.org/
+IUSE=armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python3_8 python_targets_python3_9 elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD Info-ZIP MIT
+RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( 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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
+SLOT=0/3.3
+SRC_URI=https://download.osgeo.org/gdal/3.3.1/gdal-3.3.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=039742314139f87b99f145cd9e8d0698
diff --git a/metadata/md5-cache/sci-libs/libgeotiff-1.7.0 b/metadata/md5-cache/sci-libs/libgeotiff-1.7.0
new file mode 100644
index 000000000000..6942edf8aa25
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libgeotiff-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) 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=compile configure install prepare
+DEPEND=>=media-libs/tiff-3.9.1:0 >=sci-libs/proj-6.0.0:= sys-libs/zlib virtual/jpeg:=
+DESCRIPTION=Library for reading TIFF files with embedded tags for geographic information
+EAPI=7
+HOMEPAGE=https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=media-libs/tiff-3.9.1:0 >=sci-libs/proj-6.0.0:= sys-libs/zlib virtual/jpeg:=
+SLOT=0/5
+SRC_URI=https://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.7.0.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=788d76908bd882b7c6b6e6bcf5c53443
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.18.0 b/metadata/md5-cache/sci-libs/libqalculate-3.18.0
index 6c7bc21d59b5..6b1278ca91ea 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-3.18.0
+++ b/metadata/md5-cache/sci-libs/libqalculate-3.18.0
@@ -5,9 +5,9 @@ DESCRIPTION=A modern multi-purpose calculator library
 EAPI=7
 HOMEPAGE=https://qalculate.github.io/
 IUSE=curl icu gnuplot readline
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 SLOT=0/21
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v3.18.0/libqalculate-3.18.0.tar.gz
-_md5_=081d39ec00a78e240b2a055a588121a1
+_md5_=b7b2cde126d092825f8929d7544433ca
diff --git a/metadata/md5-cache/sci-libs/proj-7.2.1 b/metadata/md5-cache/sci-libs/proj-7.2.1
index c32f26c73566..0d0d16b962d2 100644
--- a/metadata/md5-cache/sci-libs/proj-7.2.1
+++ b/metadata/md5-cache/sci-libs/proj-7.2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install unpack
 DEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
 DESCRIPTION=PROJ coordinate transformation software
 EAPI=7
-HOMEPAGE=https://proj4.org/
+HOMEPAGE=https://proj.org/
 IUSE=curl europe static-libs test +tiff
 KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( !europe )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://download.osgeo.org/proj/proj-7.2.1.tar.gz https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz europe? ( https://download.osgeo.org/proj/proj-datumgrid-europe-1.6.tar.gz )
-_md5_=5f7fd972e52ef49fbdfcaeb467e32924
+_md5_=a2f36d2a9607d63a926bde8f82f4387f
diff --git a/metadata/md5-cache/sci-libs/proj-8.0.1 b/metadata/md5-cache/sci-libs/proj-8.0.1
index 30cf7954f9a0..8c5a5fc596b9 100644
--- a/metadata/md5-cache/sci-libs/proj-8.0.1
+++ b/metadata/md5-cache/sci-libs/proj-8.0.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff ) test? ( dev-cpp/gtest )
 DESCRIPTION=PROJ coordinate transformation software
 EAPI=7
-HOMEPAGE=https://proj4.org/
+HOMEPAGE=https://proj.org/
 IUSE=curl europe test +tiff
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://download.osgeo.org/proj/proj-8.0.1.tar.gz https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz europe? ( https://download.osgeo.org/proj/proj-datumgrid-europe-1.6.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e7818b7eb659d49287f4520208945e6
+_md5_=ed43f21eec5b61519fb752f00d6abaa1
diff --git a/metadata/md5-cache/sci-libs/proj-8.1.0-r1 b/metadata/md5-cache/sci-libs/proj-8.1.0-r1
new file mode 100644
index 000000000000..960af1933f85
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/proj-8.1.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff ) test? ( dev-cpp/gtest )
+DESCRIPTION=PROJ coordinate transformation software
+EAPI=7
+HOMEPAGE=https://proj.org/
+IUSE=curl europe test +tiff
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+RDEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
+REQUIRED_USE=test? ( !europe )
+RESTRICT=!test? ( test )
+SLOT=0/23
+SRC_URI=https://download.osgeo.org/proj/proj-8.1.0.tar.gz https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz europe? ( https://download.osgeo.org/proj/proj-datumgrid-europe-1.6.tar.gz )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d237c8bc70924d9e173ed708b6c7e9a3
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index f7f0b76c2484..08f7ce3ed09d 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/lcalc-2.0.1 b/metadata/md5-cache/sci-mathematics/lcalc-2.0.2
similarity index 74%
rename from metadata/md5-cache/sci-mathematics/lcalc-2.0.1
rename to metadata/md5-cache/sci-mathematics/lcalc-2.0.2
index a25b8cb6af8d..f1bd8ead844b 100644
--- a/metadata/md5-cache/sci-mathematics/lcalc-2.0.1
+++ b/metadata/md5-cache/sci-mathematics/lcalc-2.0.2
@@ -9,5 +9,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2+
 REQUIRED_USE=^^ ( double double-double quad-double )
 SLOT=0/1
-SRC_URI=https://gitlab.com/sagemath/lcalc/uploads/01b46cdbbf3e67a322320dc0b2750d50/lcalc-2.0.1.tar.xz
-_md5_=37e250181c1110dec55f6d2bec0f064d
+SRC_URI=https://gitlab.com/sagemath/lcalc/uploads/e7158e6f51f40012ea97fbb9c798da56/lcalc-2.0.2.tar.xz
+_md5_=9512c67c3742e3aa610b46ee29c86b6c
diff --git a/metadata/md5-cache/sci-mathematics/planarity-3.0.1.0 b/metadata/md5-cache/sci-mathematics/planarity-3.0.1.1
similarity index 61%
rename from metadata/md5-cache/sci-mathematics/planarity-3.0.1.0
rename to metadata/md5-cache/sci-mathematics/planarity-3.0.1.1
index 67602cdd8bb8..46fa7dcec71a 100644
--- a/metadata/md5-cache/sci-mathematics/planarity-3.0.1.0
+++ b/metadata/md5-cache/sci-mathematics/planarity-3.0.1.1
@@ -1,10 +1,9 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=install
 DESCRIPTION=The edge addition planarity suite of graph algorithms
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/graph-algorithms/edge-addition-planarity-suite/
-IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_3.0.1.0/planarity-3.0.1.0.tar.gz
-_md5_=652a9799c181f6655cdf340d924fe4fa
+SRC_URI=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_3.0.1.1/planarity-3.0.1.1.tar.gz
+_md5_=ff41f8a827e07e18a0b7f21e452828e0
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index 3cfa2e0b5b62..4331443b2999 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
index 1957ebd1a0d0..f9aa8649dbdd 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8af4d5698522af0144b83ac4652692a4
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20210203-r1
index 3246f818422c..6e5c87e9235c 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=188bd062f4f906dbff2200d5c86bd609
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-9999 b/metadata/md5-cache/sec-policy/selinux-abrt-9999
index a415eb01f226..4d25e900f4a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=188bd062f4f906dbff2200d5c86bd609
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
index 4e9709c8614b..1f63f0da0c7b 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1d18fee6872d7065e8d4de20605a231e
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20210203-r1
index ffd43d4d77b7..354fb5c2dff8 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ea7ca99c3052add2c1e87ec1e4aef880
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-9999 b/metadata/md5-cache/sec-policy/selinux-accountsd-9999
index 98f23bf77077..45a2aa3411ac 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ea7ca99c3052add2c1e87ec1e4aef880
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
index 7dbb43481245..f0b1eaf5b8eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e5e87df8bcca372a67cda5423c7b0dfb
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-acct-2.20210203-r1
index bc3eb4dca35c..1e56876331dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=17e14fd4856570295c774cba6fb2b938
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-9999 b/metadata/md5-cache/sec-policy/selinux-acct-9999
index bf8692e79a7a..702c4a4edf23 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-acct-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=17e14fd4856570295c774cba6fb2b938
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
index abb06b4aa536..bba2e1364aab 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9a8b7dd4fe64b583ccbba12c092663af
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-afs-2.20210203-r1
index bf8e3d606623..6a5f17d1f39b 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16e00444f0a8625676303e152a3f280a
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-9999 b/metadata/md5-cache/sec-policy/selinux-afs-9999
index e48ab9769c07..1da85f9323d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-afs-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16e00444f0a8625676303e152a3f280a
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
index 207516f787c9..f3da811ffae0 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c0b495824b10584cd787f3062d52f49e
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-aide-2.20210203-r1
index 30748d4f2a97..bb5099c6bdb1 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f4e8e6cd88dde9cef76f5b4a083b9564
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-9999 b/metadata/md5-cache/sec-policy/selinux-aide-9999
index 7e8e31ef85ff..959682fd5c33 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-9999
+++ b/metadata/md5-cache/sec-policy/selinux-aide-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f4e8e6cd88dde9cef76f5b4a083b9564
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
index 2bee8e0941c6..62342b9ad8a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=068c8a33b6372befa408d28e2e2e0657
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20210203-r1
index 52084a60ab3f..fd284b9c5489 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=00cf0df9f590ad91618b61e1aef91a1d
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-9999 b/metadata/md5-cache/sec-policy/selinux-alsa-9999
index c21519096549..003950b6abb8 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-9999
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=00cf0df9f590ad91618b61e1aef91a1d
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
index 6bd49911eb1c..e60f495ecf14 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=93e6bd56197ec9aaafa602ba4ad7d9e6
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20210203-r1
index f7b2fa0edf5a..4449129083dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a25c65f59a8ad7726e6750bc27ff78a8
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-9999 b/metadata/md5-cache/sec-policy/selinux-amanda-9999
index 8baa1f6ff339..8e73f6ccca34 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a25c65f59a8ad7726e6750bc27ff78a8
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
index ae1b31be6c93..2d5d6176d024 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4d76a81aef2648708f09002a54c70671
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20210203-r1
index 3952ad9c4b44..1b960215f7e0 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4440eaa92a3336f0211bdb77557753fc
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-9999 b/metadata/md5-cache/sec-policy/selinux-amavis-9999
index 991ecb7019c1..49e8934b426b 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4440eaa92a3336f0211bdb77557753fc
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
index 624a4e544520..3748c67b4d61 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=cc52a7081990c2898c6a2997d817ecd9
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-android-2.20210203-r1
index 0856625d85c4..085e67f7a4a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=340604212e429989d1322bc1aae3c9f2
diff --git a/metadata/md5-cache/sec-policy/selinux-android-9999 b/metadata/md5-cache/sec-policy/selinux-android-9999
index 0fa0a3a04e77..155ec69362ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-9999
+++ b/metadata/md5-cache/sec-policy/selinux-android-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=340604212e429989d1322bc1aae3c9f2
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
index a0ad161ee296..8e8768f194b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5e607b0c42628ccb2deec1a0647440ce
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20210203-r1
index ba506cfc96b4..21840961d84f 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=631ec9c3af109e7f8533c548feb7e57d
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-9999 b/metadata/md5-cache/sec-policy/selinux-apache-9999
index 227371ecec06..b6e07421679f 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apache-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=631ec9c3af109e7f8533c548feb7e57d
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
index ab5c99e484e1..fa97c89d16cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=88d66460f8363346e7e69ec30fbf2cf5
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20210203-r1
index bf20a16d6f3e..01bf412698c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0da390b52bfd840ecd7f4393165cb415
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999 b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
index ed9006613d97..66e901be108a 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0da390b52bfd840ecd7f4393165cb415
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
index c3e528e1a363..309af71c94f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2eef0d57dba5833779dd5b168bc5dec9
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-apm-2.20210203-r1
index 1b25be44205d..5f74e84eb8e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3bf9e1a259aa55a0bf8dc52ef189fe40
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-9999 b/metadata/md5-cache/sec-policy/selinux-apm-9999
index 82ee49914f5c..84ada51f0f0c 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3bf9e1a259aa55a0bf8dc52ef189fe40
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
index d4b0f6d8ddeb..5913be152c44 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d0d7dcb54db3935a7a60ada7aa0aa7a0
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20210203-r1
index 61e175b5c7a4..39709818947a 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b5dbebb3d3a2f6060a8dd8c12716c63c
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999 b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
index fd22dd3070d1..98e923090229 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b5dbebb3d3a2f6060a8dd8c12716c63c
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
index c4f0bfbf80c9..702e53561abb 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3fcf7dbbde1de048d5b53b248bd0ec56
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20210203-r1
index 1ebce5995803..4dfd6aba4c8a 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=90045658429b1d12497130faccae35a2
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-9999 b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
index 9a86a12f2205..57a2b28f3c9f 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=90045658429b1d12497130faccae35a2
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
index 3b83697f1a96..563a2b8ee588 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=22cd4ad8c9c44cf312642f37ab43c588
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-at-2.20210203-r1
index aac4ce5de792..4f1ae2dc427a 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9f90001df8d539aa19bc413d460e6450
diff --git a/metadata/md5-cache/sec-policy/selinux-at-9999 b/metadata/md5-cache/sec-policy/selinux-at-9999
index c92bad9256bc..e4a32de64549 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-9999
+++ b/metadata/md5-cache/sec-policy/selinux-at-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9f90001df8d539aa19bc413d460e6450
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
index f418626434a6..a9763a9d4ba4 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=09023e944da28817dd4a9b0a27b8f3ac
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-automount-2.20210203-r1
index 6640233dad15..e06c0de5cf52 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=40c885c98270a7200ad0b7ff0857a538
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-9999 b/metadata/md5-cache/sec-policy/selinux-automount-9999
index 2e12ce38c5a0..dd8a34a5e7c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-9999
+++ b/metadata/md5-cache/sec-policy/selinux-automount-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=40c885c98270a7200ad0b7ff0857a538
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
index 877af46cd9de..6ed87426693c 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b7f7211f7f5d72a82c332d063dcdfb10
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20210203-r1
index cda2de357da4..4ca5822a72eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=72345a02bf92684c4cd885a4a177b6a0
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-9999 b/metadata/md5-cache/sec-policy/selinux-avahi-9999
index 985bfdc770fe..c1f8e00c491d 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-9999
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=72345a02bf92684c4cd885a4a177b6a0
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
index 17c44876d504..b42b901d537f 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8ff182921dd0f6919fe26e147ac9f42f
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20210203-r1
index 789593d2e67e..0764476b3d43 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e9e5b5837320e93ed07bf2904ea2b860
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-9999 b/metadata/md5-cache/sec-policy/selinux-awstats-9999
index f36af34e552b..6006805fb5a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-9999
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e9e5b5837320e93ed07bf2904ea2b860
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
index 201a84e127ed..f02ee81a2a8c 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e8f7442f5353dde6e636de76454a8324
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-backup-2.20210203-r1
index 2527b117dd75..699c21bb8966 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2c03587c9424250ab2b0a0aa29dc795b
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-9999 b/metadata/md5-cache/sec-policy/selinux-backup-9999
index 83297728b849..a3de9a214c4f 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-backup-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2c03587c9424250ab2b0a0aa29dc795b
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
index a6ed81b45c62..eccd738d5b35 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=be36964768ea2f1ac6b875e5e7cd5ec4
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20210203-r1
index 7006028e3b5f..ae0a166e5540 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4fd3e9ffd15418acf7ad32b3cab1fc1c
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-9999 b/metadata/md5-cache/sec-policy/selinux-bacula-9999
index c23c2dd96c40..8988d1e1f436 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4fd3e9ffd15418acf7ad32b3cab1fc1c
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
index aff296c97952..f0e8f6150e4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=370572234361320741992f6fcc890818
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-bind-2.20210203-r1
index 08f069201c3a..e578c1047158 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bba6f1fd91270c0dd0266d3362a5aa76
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-9999 b/metadata/md5-cache/sec-policy/selinux-bind-9999
index a5cbc88f2305..d6111011d473 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bind-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bba6f1fd91270c0dd0266d3362a5aa76
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
index ae126680a9e7..1060efc8c419 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=56bb0b51938a461e9dcfb5c35731089a
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20210203-r1
index ffb08002d86e..591266be798a 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a5d48ea0bdf23cbae3821221799dbc67
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-9999 b/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
index 01e61b5f0249..f80ae4504d0d 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a5d48ea0bdf23cbae3821221799dbc67
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
index 43639b7fa280..51991040e36b 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c24cbbac855a80ba7bc08020daa9668b
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20210203-r1
index f38c509e867a..18baf4232488 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fff77fa37b6fa1ce5792ce528623594f
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999 b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
index 9994c7d9adc9..a84121ff2aa2 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fff77fa37b6fa1ce5792ce528623594f
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
index 28e17ba9a4d7..688e59caaa7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=727d0bd85d096c95be74947bd8a35a10
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20210203-r1
index b2752693fb6a..d5fca08a024b 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6574b59bf4fc348284170c70a81e1006
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999 b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
index 858840547a66..73a22bf1823f 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6574b59bf4fc348284170c70a81e1006
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
index 764b00569b6d..7c3a8ca26aab 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ba74ba7893b4fbdf0cf46a4a8e431a4a
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20210203-r1
index f6de9c3ed083..fa4a43a166c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7c405b39ec630ef5eddd951c582359ad
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-9999 b/metadata/md5-cache/sec-policy/selinux-brctl-9999
index 9773d1853c9a..84def2e3ac87 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7c405b39ec630ef5eddd951c582359ad
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
index f25790f03eb6..b4708072ae6a 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a5a4f2e508600d45a1b81d7471272224
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20210203-r1
index 0ce017222fbc..b0a3e971d970 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a9c7db159b0b1bc9de7cc15916d9f09f
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
index 135f96bc393e..4b3c35f3fe11 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a9c7db159b0b1bc9de7cc15916d9f09f
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
index a6138ee2b8d5..9c3dfdb27508 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4e94d8c098a7a4445b6a561b9b0f60c1
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20210203-r1
index e000c9ebc3e5..c9a76363f11a 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16002b5ddae8096a12ecb837004e404c
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-9999 b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
index 3f20d12891e3..f8417b6f252e 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-9999
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16002b5ddae8096a12ecb837004e404c
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
index 2b2aff2483cc..0bf36309eef2 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e34778f374fde2dc5ec215676cbb2aa3
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-canna-2.20210203-r1
index ef186e381a3d..a27416a1adee 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ce4e503b272d9cd733e7de93729522a4
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-9999 b/metadata/md5-cache/sec-policy/selinux-canna-9999
index 0db4818d9be3..026f6c1aee7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-9999
+++ b/metadata/md5-cache/sec-policy/selinux-canna-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ce4e503b272d9cd733e7de93729522a4
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
index 8bebe45b42f6..5c69e0982d33 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2c76a2345b7929bf32d60076c904a7cb
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20210203-r1
index a4e4b7d7da8a..a92a7c213b05 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bc2db0b2f739a5e3fea9e53cfa49cfb7
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-9999 b/metadata/md5-cache/sec-policy/selinux-ccs-9999
index f001ea63850d..253a8f563f63 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bc2db0b2f739a5e3fea9e53cfa49cfb7
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
index 67dee6d7d62d..60f39d9ca903 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=203b0dafa75c0e08e4de2146e24e7682
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20210203-r1
index 467fe5fab33d..398da4005767 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2416ddbc06aec4c541f6d2241cf317e3
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999 b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
index 33389d180bc9..dbc6ba851bbc 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2416ddbc06aec4c541f6d2241cf317e3
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
index c17590c69699..8695c1119e9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=23c0c8c306646d65fcde4ef4c856293f
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20210203-r1
index db21f76de29b..c187df38b4f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=13f8b697937e069a6fbadb796cd50896
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-9999 b/metadata/md5-cache/sec-policy/selinux-ceph-9999
index 29f4d209fca3..5ba4c4637ec6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=13f8b697937e069a6fbadb796cd50896
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
index 28e69813b225..1759a274ca1b 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9cb0829fe7ab5416160773069ce227ab
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20210203-r1
index f03e336d7f28..5e9105b6ab59 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6a1e6a7fd5b1f84c98556d87b24b365a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
index a22db20abdfb..d80e171c9867 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6a1e6a7fd5b1f84c98556d87b24b365a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
index 2396a53b2e3b..1b381b932bda 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ee1ea01fc8445038652b5b96746b29fc
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20210203-r1
index 9d79ee1177d0..a411f5c72b11 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=91e937d31201ed0eb38164f653898982
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-9999 b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
index 5b704a4c2246..1897511f90b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=91e937d31201ed0eb38164f653898982
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
index b88dac357b39..12b4e7ce2cd8 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e5c5cab2c1defb33b1d06f360a7457ce
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20210203-r1
index 38a9badff778..9e119f55d749 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20210203-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9c938e017cb8a5249fb7215d1b88e2ce
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-9999 b/metadata/md5-cache/sec-policy/selinux-chromium-9999
index 4e388a92289e..7a1ed1c1dc0e 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9c938e017cb8a5249fb7215d1b88e2ce
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
index 862f57304f8b..317e934d1463 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=46f7de008ee9ab187e7f10b383242bc7
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20210203-r1
index c6a6e68c7b4a..b75eaaffc8cc 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9e89a6e3bc149c7654a2b05f8e41534f
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-9999 b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
index 825e2e4863c0..5cb72d57c38b 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9e89a6e3bc149c7654a2b05f8e41534f
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
index 9a243253ef15..c6a6d654e638 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2dd521aebc9face9364d104811b3ea5e
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20210203-r1
index fcdba15a5790..034fd54accd1 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=45d62591bd97db86386cba77f6b54251
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-9999 b/metadata/md5-cache/sec-policy/selinux-clamav-9999
index 6a30a90e7cc9..0b8e2438fefb 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=45d62591bd97db86386cba77f6b54251
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
index e3f591fc7e0e..7613c6544817 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=84dc6761362bcffa4c5e5ea5e20f6f2e
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20210203-r1
index 2258c040d583..2d1a756cb89c 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d284098113b48870f22c292574443561
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999 b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
index edaaa28579ea..b004fdd871b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d284098113b48870f22c292574443561
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
index 96115d404631..21615e53e310 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=aaf83281930f04e3aba02e2e5af77819
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20210203-r1
index 0eb7a3ba4c60..040b9010638d 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5b59411a6190ee0619f56c2e89e7acac
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-9999 b/metadata/md5-cache/sec-policy/selinux-collectd-9999
index 4359d5b1042f..69a61b274b04 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5b59411a6190ee0619f56c2e89e7acac
diff --git a/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
index 88e0bc1eeaff..0a74acf57cee 100644
--- a/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3b8fa2d6e9cb23d33a242729568821ba
diff --git a/metadata/md5-cache/sec-policy/selinux-colord-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-colord-2.20210203-r1
index 880d65f580e8..b85a8409e797 100644
--- a/metadata/md5-cache/sec-policy/selinux-colord-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-colord-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2f066aa3fc14037d278441aee2a49dd8
diff --git a/metadata/md5-cache/sec-policy/selinux-colord-9999 b/metadata/md5-cache/sec-policy/selinux-colord-9999
index 42ff60af9716..2763c2bee2a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-colord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-colord-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2f066aa3fc14037d278441aee2a49dd8
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
index 1eab400faf1a..982dca296ab6 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8d170c516ab4b18239994ccff502b3a0
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20210203-r1
index 37bb2f4c26aa..59b4fcd2ea2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a1572aae2beb0942a716cfb4c9c086ee
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-9999 b/metadata/md5-cache/sec-policy/selinux-corosync-9999
index bb4c4ecac304..e4e0cb3af5de 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-9999
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a1572aae2beb0942a716cfb4c9c086ee
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
index 221037da3bc7..af3ae4273357 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=31c99c1f9cd278cebf560c81c3e3f407
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20210203-r1
index 2d839775a5a6..073f0fc42271 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e198051007fa00ef2b82acef5a9fc155
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-9999 b/metadata/md5-cache/sec-policy/selinux-couchdb-9999
index 0e7a350cb74f..4872a3b1382c 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-9999
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e198051007fa00ef2b82acef5a9fc155
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
index dd3c008e8245..09378f3c5c7c 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1230870e872507bc5d9d85c1d88239cb
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-courier-2.20210203-r1
index d5a9f3d945be..020166b030bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d04651bedf5c29cee9c58b9bbe805507
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-9999 b/metadata/md5-cache/sec-policy/selinux-courier-9999
index a445b6c29308..c4c18798b08c 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-9999
+++ b/metadata/md5-cache/sec-policy/selinux-courier-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d04651bedf5c29cee9c58b9bbe805507
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
index e31ecfed839f..b7f0a5aecce5 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d8f0e3249aa8255d5af1377bf2f6733a
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20210203-r1
index 3da99567d4ab..ae5cd5885d83 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ec0c9e33321059a933494bdef7808104
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
index f29caf3554d4..9d30897ef91e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ec0c9e33321059a933494bdef7808104
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
index 35c54d6ad96a..dd45d76cc159 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9d750159cd08865dc9c27a2114a7e712
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20210203-r1
index f1af241a941c..afde4ac42b75 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=be704187bcb7fba788bbba0277e603d1
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
index ac195fa9d602..5e353069c400 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=be704187bcb7fba788bbba0277e603d1
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
index 87b282c629fc..7d3a2ce07073 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=785e5f7799da23296cb352e1e12139ca
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20210203-r1
index b5e83e42ee3b..f2fdfd29cd4c 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=96df904ede5b1624e423641858b1f0ef
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-9999 b/metadata/md5-cache/sec-policy/selinux-cups-9999
index 78a46fbf93c7..554102fc8f3e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cups-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=96df904ede5b1624e423641858b1f0ef
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
index 67432e0bc7a7..90eddff7711a 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ad7d535903a20c097425ff6a52192532
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20210203-r1
index cc1a255edd2d..d016254db73c 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5ed35a2629d6fb2b43e6768243af77ac
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-9999 b/metadata/md5-cache/sec-policy/selinux-cvs-9999
index 5665555617fd..b3e6e75a7cb4 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5ed35a2629d6fb2b43e6768243af77ac
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
index e039a20f251d..22de998d00b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=39a5ac5562ab98112a2f1f7984480993
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20210203-r1
index 6728dd7e77b2..67c6403ec1df 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=55f0f8eaf0fb837ec9e3bafb42548587
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999 b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
index 938c17abd303..49673f04a07d 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=55f0f8eaf0fb837ec9e3bafb42548587
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
index ed3707023920..e610975b6199 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4a99082696a7a116a5442749297d2780
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20210203-r1
index f43763d630d8..97f47a9a8bf0 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9068faad91c9574a26ed7d1400ef02e2
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-9999 b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
index 5c28b21fae92..4a12171e2fc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-9999
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9068faad91c9574a26ed7d1400ef02e2
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
index 986b4a6a7912..5eaf8051b42b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=255f512214f01e576008b59b46060b1e
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dante-2.20210203-r1
index 253929f6bc3c..e1e440b77d06 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6b6abc1b54d767c7a430a498261b12ab
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-9999 b/metadata/md5-cache/sec-policy/selinux-dante-9999
index da4fbc0fbc2c..53f7229c6bbf 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dante-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6b6abc1b54d767c7a430a498261b12ab
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
index 5c45cd1326c6..89b4a145984a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d582fb7f1226ed7a40f88660576d6176
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20210203-r1
index 78af23cee18a..78398bff14ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8a0cd1e93a88399bc2e0aac1872e5234
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-9999 b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
index da35c911062e..27af602cd802 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8a0cd1e93a88399bc2e0aac1872e5234
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
index beea78c3117d..0e42dbfaa813 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=095c685fba56c6ac28ff7525c3321281
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20210203-r1
index 6cb85b9449b0..d3b32af48cd2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5d4de8ffa342dbf995a963f82eb5eeda
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-9999 b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
index f85d4539acbb..7170a02f0d8e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5d4de8ffa342dbf995a963f82eb5eeda
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
index 796435abb1a6..13274f415727 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=13c6887f8d5367ad49f7efa599d06d2a
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20210203-r1
index 75510c2928c8..83c2d7b38cc3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ee09e9a004b5ef8f0516863961f2d9ea
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-9999 b/metadata/md5-cache/sec-policy/selinux-dbus-9999
index 530d8266357a..f723c0b6ffe7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ee09e9a004b5ef8f0516863961f2d9ea
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
index d34186c6550a..26d736815f7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e89668dd0628e48ed12cec44c9de9772
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20210203-r1
index b88241662aaa..485e86f1725b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=588ae3dd8ba44da63b96aff97eb651a4
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-9999 b/metadata/md5-cache/sec-policy/selinux-dcc-9999
index 9561e414ad10..0eb619814ca3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=588ae3dd8ba44da63b96aff97eb651a4
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
index 370ad56c5484..b3e0bfdcd948 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d811a3530dea5bd7b979ad60462042cf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20210203-r1
index 24f13fe457a6..bd46b0c57c5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=cc1d98cedf67fe4673808e8b8bcd2ce3
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-9999 b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
index af705d38a7c2..d2650a065a45 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=cc1d98cedf67fe4673808e8b8bcd2ce3
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
index bcfe92f70d4f..82c723cb375a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=57c73619ebaf5f4491220e79061e99ae
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20210203-r1
index f44c650e2808..11d0b9c11ad3 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5fd76a73d9efb2cb67f9173c9822ab8a
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
index 38d6cac586f2..a547a273c1a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5fd76a73d9efb2cb67f9173c9822ab8a
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
index 04499f533bcd..bccff1b534e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b3f49aae86e31b74c67f0c19dac97a6b
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20210203-r1
index b0eb7aefcf22..4de994f548ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c1fa51329d01ec1d1804eff4d46f6cb5
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999 b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
index 26b826506b2a..8a01f6403fc6 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c1fa51329d01ec1d1804eff4d46f6cb5
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
index ded1e6087f34..558fac64507d 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=60a012533306531e11ab712c8dea1f55
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20210203-r1
index a50d37dc3ab5..6d6cef5f894c 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=96d99dfac8c3f98487f79ae7c2640451
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-9999 b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
index cd504b8d1c58..67b117742f7b 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=96d99dfac8c3f98487f79ae7c2640451
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
index 739a3a462a77..5911fdce6a57 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f43688b444a992ad7fe8ab1a42226981
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20210203-r1
index e725a32a23f6..ac6fef45b3f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=581a6dfa35552f2335309f3591b13ec4
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-9999 b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
index d921cbfbe901..8aac74a58b0f 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=581a6dfa35552f2335309f3591b13ec4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
index 7ab924a62ab6..4ef4fedc7b51 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5554da68d8f1e29ac840efbd1742206b
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20210203-r1
index 2f552499664a..e769d5d2e30a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4118ade79f2b31a37cbaefab29179022
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-9999 b/metadata/md5-cache/sec-policy/selinux-dictd-9999
index 9650ffb9cb33..fd89df0e6ab0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4118ade79f2b31a37cbaefab29179022
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
index e86ae9d488b4..78d423533fcd 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=161eaae037eb050c2b312df043ed452f
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20210203-r1
index 666d3e0df307..e9f822ca9ce0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d23da3acf6dd4f626accfbf78ca484ad
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-9999 b/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
index a91566a4c813..112e233fdb7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d23da3acf6dd4f626accfbf78ca484ad
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
index d6b55ac35eb6..fb5571311e91 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c8e952e2daaf86f07218fcecdf46dd56
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20210203-r1
index 3408a26da9fc..5fb7b5833377 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16a95e0356916d0d905dfa9d1fc2500a
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999 b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
index 6ec266f619b2..cad9dd6aaf2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16a95e0356916d0d905dfa9d1fc2500a
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
index 42eb08bc6320..e6750190a583 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=291c2815fa4a71117e5d721094521476
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20210203-r1
index 8d8711ba6dee..81b29bede74d 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7b251119c6361fcc5d4a3de18d560c8d
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-9999 b/metadata/md5-cache/sec-policy/selinux-distcc-9999
index 352f325d323b..bd1522d62c45 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7b251119c6361fcc5d4a3de18d560c8d
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
index 62a3c52bc0e1..564bc3c7adb5 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=91daee8f83712455d8c75da56237e1bd
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20210203-r1
index 7eaa49d71ff7..5591b7df1815 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f938493500826ca914f6098d1e143b38
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-9999 b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
index cb984610aef5..020bfefd8d9a 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-9999
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f938493500826ca914f6098d1e143b38
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
index 3bcb0329d6d7..c5519fd54f26 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=540c6f53ec4b28614fe2f0a533eae1b6
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20210203-r1
index adf41e0ba175..069d56d42a3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bf2c712c5d5ac3e760fa76618b61173d
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-9999 b/metadata/md5-cache/sec-policy/selinux-dkim-9999
index 6da3767b8716..743f198d40ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bf2c712c5d5ac3e760fa76618b61173d
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
index d72870e8f652..5ead883861e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e6a0af639ec30800d70180b296460c0f
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20210203-r1
index ff1049e84244..f4bbadcc12fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c8588f68855cd79a7c9f6cc0dd117e6e
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999 b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
index cc539fb3457f..55dbeebc1a21 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c8588f68855cd79a7c9f6cc0dd117e6e
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
index 5943c1f07ada..b4caecdacdc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b396fb003f9614edc386b4447529fb08
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20210203-r1
index f149900b6ae8..88d0010a27d8 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dc322d968bde55fbb5285172a4d8dbf4
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
index f07f822b8acc..5ba4cf45bc66 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dc322d968bde55fbb5285172a4d8dbf4
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
index c8dc8820ad22..c6e9af50b2cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4329a8db2e73a7db3943e861900316aa
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20210203-r1
index 75b2d62da9e0..3ff0272ab99b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e02b88177d44ade86765017b6b3f82fe
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-9999 b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
index b5bd3dd437d8..296b802ddbb5 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e02b88177d44ade86765017b6b3f82fe
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
index 78a2c74c0ca3..e489eb82910c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=749a31287b88d6f8c901a87e5ff48cce
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20210203-r1
index f473e4eb8136..ec456247bcc0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=85b17f42413220e020a6ab71240d4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-9999 b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
index 219edc5743a3..e5355b86b616 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=85b17f42413220e020a6ab71240d4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
index c98d8123e3dd..0ffc37d1d1c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8f2f756bc091a6983eb0c152c3c3ec18
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20210203-r1
index d117715bcdb6..946108b2cf1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=222d71cd717a8ad9fd7b84d2de1fa7f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-9999 b/metadata/md5-cache/sec-policy/selinux-dracut-9999
index fa08d41dfd58..ce2c8984b3a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=222d71cd717a8ad9fd7b84d2de1fa7f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
index c3d9437153d2..d3dba8f0033b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=da2aa570d586c299a45482bd13a6d450
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20210203-r1
index bba87e46faa7..c1b01d2b78b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b50f8eb0a460c5060ed2342cbe96324f
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-9999 b/metadata/md5-cache/sec-policy/selinux-dropbox-9999
index d5382dd54fc2..3eba90857dcd 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b50f8eb0a460c5060ed2342cbe96324f
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
index eb30fa43194e..fda291e8b8e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=cb262e83706f81522ac80962776d0026
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20210203-r1
index f96aa9b91c99..696d529cccb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8b68cef293f9e8f4f0f1488b648d29d1
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-9999 b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
index bd18c721e980..926d712bfcd4 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8b68cef293f9e8f4f0f1488b648d29d1
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
index 59a45956984c..0c02ade1baf8 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=953f85dcf8e49c719bdd55a30fb24fb3
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20210203-r1
index a9f2a6e149ca..49349557b7f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=13e99cc43fc2f347b8cb1af3ac9ba079
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-9999 b/metadata/md5-cache/sec-policy/selinux-evolution-9999
index 83e713f66ee4..714e2dacd50b 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-9999
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=13e99cc43fc2f347b8cb1af3ac9ba079
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
index fffcb0be18d7..028df55e6827 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=681385fb0710fa70c4f5258d94ad120f
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-exim-2.20210203-r1
index a22e38d400cb..8dc171c254d4 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c44f3f713376894052004e9e3d51d7cf
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-9999 b/metadata/md5-cache/sec-policy/selinux-exim-9999
index e6890499c294..70116a1cfeda 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-exim-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c44f3f713376894052004e9e3d51d7cf
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
index f796e96e416b..5c393ec69309 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1bd0a4a65a7b1f14f592cdf79611c4bc
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20210203-r1
index d3921cb7c56c..beec951dd12b 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5de2eb8428344082fb58e005b5c68a8e
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999 b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
index 65f05a88b616..5c1b4b038559 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5de2eb8428344082fb58e005b5c68a8e
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
index fac70aa779fd..e87427588040 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=345096825d5213204849b1a88d09457d
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20210203-r1
index 28639b89c8cb..6da22938eb21 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d4874ba7df95f7518a822c8bdc4dec6c
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999 b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
index 8d3a81fe8d58..b9e27da5e4a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d4874ba7df95f7518a822c8bdc4dec6c
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
index 0fe2bd55f336..9ccb3d965b75 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=873137767efb484c1380ba115b9e3825
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-finger-2.20210203-r1
index c49f0bde476b..6d79ba7fabb5 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d6f4112b941f0246662113c5f9b42666
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-9999 b/metadata/md5-cache/sec-policy/selinux-finger-9999
index 65b64ef043c4..7aaf5210d008 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-9999
+++ b/metadata/md5-cache/sec-policy/selinux-finger-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d6f4112b941f0246662113c5f9b42666
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
index a14d08681ec4..b5794afc8e54 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f5e1735d76242aa3ae07c77c3b223ad2
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-flash-2.20210203-r1
index e9ccc414f15d..53aefc59e91f 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=639d54b9959bc6a9d5d1bdc8986b945c
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-9999 b/metadata/md5-cache/sec-policy/selinux-flash-9999
index 5790ad9b0e9a..e20c045d2619 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-9999
+++ b/metadata/md5-cache/sec-policy/selinux-flash-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=639d54b9959bc6a9d5d1bdc8986b945c
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
index 4e38b0eac6b8..1803184c82e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a52adfe10e35c9e48607980d7b85ca0c
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20210203-r1
index be7fcfd4080f..b1525a16114c 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=437ee26ce94b71c4c775575a132e676f
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-9999 b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
index 908155b73cad..d37ec0c16dee 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=437ee26ce94b71c4c775575a132e676f
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
index 27b170ac8f35..9a84d5a0c5be 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9742d3f1f0cfd89f94cbb75977d95e5e
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20210203-r1
index c8ae91b8ccbd..8c194ab15886 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fa6b7f711826aaba2d712d7d45e0aa7b
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-9999 b/metadata/md5-cache/sec-policy/selinux-ftp-9999
index 4db5b2d3880a..3ba8e2614a73 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fa6b7f711826aaba2d712d7d45e0aa7b
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
index 6bd1de4c4bb7..6e31d038c48f 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2ebb38cdbb2b013af01522525e60a932
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-games-2.20210203-r1
index c42c9174f61d..20a09a0e048a 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8738b21da6e226209b1bbcb8a5d2a815
diff --git a/metadata/md5-cache/sec-policy/selinux-games-9999 b/metadata/md5-cache/sec-policy/selinux-games-9999
index 188140b8a6a1..98d00a512144 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-9999
+++ b/metadata/md5-cache/sec-policy/selinux-games-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8738b21da6e226209b1bbcb8a5d2a815
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
index 15d2f79263b0..8c595ee915a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=23a1014e801aa7de410287e15676ee5f
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20210203-r1
index ef9bda68d077..3b3da029b946 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=181e8a1840b7fc4c4a3e960893049546
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
index af701cb0bc15..82473dfb5185 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=181e8a1840b7fc4c4a3e960893049546
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
index 15de530b08e1..5169e0cba80f 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4a5d7ea7ea2c17384f5a2290d50c944c
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-git-2.20210203-r1
index bd73a7c47e5b..526b27771f84 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a8105a68b13f8fb45a89a51e7cfb3cd7
diff --git a/metadata/md5-cache/sec-policy/selinux-git-9999 b/metadata/md5-cache/sec-policy/selinux-git-9999
index a6ed0a97ac6c..2650ebc0f582 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-9999
+++ b/metadata/md5-cache/sec-policy/selinux-git-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a8105a68b13f8fb45a89a51e7cfb3cd7
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
index 0b987540eb02..7cc8ae7a0e68 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6b98650411ffac54790a406732a42e90
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20210203-r1
index 99ec50928ad7..e6daed1a9267 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d69ad7010f9539be12cdd089d91db580
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-9999 b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
index 8db05b1e6db8..9d2cf9b2e309 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d69ad7010f9539be12cdd089d91db580
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
index cb636787ff3c..5e53379dff4b 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=852e229dda87b9e000bfdd3e81baa394
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20210203-r1
index 976e15e2baba..1d237f894aca 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bcdc1cd6da7db596d6b827e7ad822d4f
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-9999 b/metadata/md5-cache/sec-policy/selinux-gnome-9999
index 06d352ef82ce..2db101fd0626 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bcdc1cd6da7db596d6b827e7ad822d4f
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
index 42ccf4b27af5..6f89a8d2934b 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8d800210e8a1ff62868cb9ea985aa2fe
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20210203-r1
index 2556c9899ccc..92817c2dc8d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20210203-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ef041ad8d83d22c56dba92fd6b686243
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-9999 b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
index 31b5136817b8..db861961d6e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ef041ad8d83d22c56dba92fd6b686243
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
index 69f2844ebbb6..09d531a30d7b 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=06bca5c5a48a305eb3d50319e781e801
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20210203-r1
index 6060485e492a..be93c04c0440 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=da04bb5372d3a08870087fc6a7d84ea0
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-9999 b/metadata/md5-cache/sec-policy/selinux-gorg-9999
index 90a957df082d..5ef19b750fe0 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=da04bb5372d3a08870087fc6a7d84ea0
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
index baeb3b0716d1..97679374141f 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=24d79975220cf518c63f83ecbb866a2f
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20210203-r1
index 5f28bc6ae666..ffaa212913c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=94ebbbf9a1e2a4b61836cb03847ed585
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-9999 b/metadata/md5-cache/sec-policy/selinux-gpg-9999
index b0115867ad55..3a96a58ff8ef 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=94ebbbf9a1e2a4b61836cb03847ed585
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
index 5650613c35e4..6260bc78f0e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0bff16d6ae0cf6597ae3a862f6a3606a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20210203-r1
index 731aa12f5688..36d0dddef71c 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3a3554393073380aea351caf513dd976
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-9999 b/metadata/md5-cache/sec-policy/selinux-gpm-9999
index 4890cfded2aa..39fc47725fe0 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3a3554393073380aea351caf513dd976
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
index b71a0f8f604a..798fa5c92850 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=45b4ffc49fff2147261ab168946085b0
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20210203-r1
index 518650d8d371..f9a0bc36c72b 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=693f6e931f35356fbc715447ae8b34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-9999 b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
index 3f925a9fc1ab..39a0cbffcd70 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=693f6e931f35356fbc715447ae8b34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
index ee9e10745e61..0464537eb34a 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b5ab7d6793105f5a916831dea5f3f1d2
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20210203-r1
index 6dadcb761d30..5a94c13ca9a9 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0a7053dad565462486c4a07f09ca7bdb
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-9999 b/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
index c67175e57d60..2d245529e1e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0a7053dad565462486c4a07f09ca7bdb
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
index 2831642861cd..8316827ebc0e 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b93c3f33f7b86971a2f4967075f954e8
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20210203-r1
index 8f22ca8097ca..d7cfacbc522d 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2be053fdcc435ce12fd114e8cb01af8f
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999 b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
index b726c9b8f28e..40dfeb3784c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2be053fdcc435ce12fd114e8cb01af8f
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
index 3bfaad1de14f..9e73d6d91884 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6e2cadbe72838bbee0d4f43e9592c451
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-howl-2.20210203-r1
index 8da5c9dbcc5c..d0135e519e5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=801131e0b130474cf54ea7c6c8f4119f
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-9999 b/metadata/md5-cache/sec-policy/selinux-howl-9999
index 3b4ba73fec89..98a12b4d6e06 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-howl-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=801131e0b130474cf54ea7c6c8f4119f
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
index 8640394385c2..a3fbd14b7f4d 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=127a1a002d97322708dcb223f2c09871
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20210203-r1
index 586ff7f00f26..a6a0ec7c6eb7 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=14539bb149f1896cb41bc7b6052a904f
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-9999 b/metadata/md5-cache/sec-policy/selinux-icecast-9999
index b3867673228e..8302851f0db6 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-9999
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=14539bb149f1896cb41bc7b6052a904f
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
index 8d44e015148c..e7750cdc044c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=473db436fe563179c9a757da0969210d
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20210203-r1
index a141e2b862eb..304f10b030dc 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e58664aeaec0ed264d83ed7154bc0718
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999 b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
index 5f8b80d3a222..c38430fa9270 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e58664aeaec0ed264d83ed7154bc0718
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
index 15ff92002ad0..16d697521d18 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dd5237b44949d4805646008b8356299c
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20210203-r1
index 412895b1aad0..07e366ac7fc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f5856bd72fdae51035865a5f2464b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-9999 b/metadata/md5-cache/sec-policy/selinux-imaze-9999
index 57291ab52e37..128731c47eb5 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-9999
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f5856bd72fdae51035865a5f2464b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
index 0cfd5bce76ba..ce959079dfab 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=cd511bc449afea71343be61a7a1a1f68
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20210203-r1
index 61d3e053afc3..a7f70fa34bfb 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f18f76fab188f1622c84dc8c2a3e65c4
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-9999 b/metadata/md5-cache/sec-policy/selinux-inetd-9999
index 3f06500abbdb..2a529c6461bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f18f76fab188f1622c84dc8c2a3e65c4
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
index 241b585ca5fc..cb134a2dc09b 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=71a4025a0d31c5f006835cef1d558282
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-inn-2.20210203-r1
index 5e2d6298e823..5c580f893cab 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=806af1df99ae23f215ee379be3b35c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-9999 b/metadata/md5-cache/sec-policy/selinux-inn-9999
index f5ec2b055dbe..37d54c0bbaa7 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inn-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=806af1df99ae23f215ee379be3b35c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
index 559c4c1d4a5a..42ab50632dec 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e694bfe6d98487e3d1a9ec7dffd46703
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20210203-r1
index e5ce9d479b9c..060d7dbbee8e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ff79c8dbfbafebb88c11d80e876a5a97
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-9999 b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
index 892e1ab1050c..2b8af9f06f60 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ff79c8dbfbafebb88c11d80e876a5a97
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
index 5351ce946a93..0c5eaa4da6d4 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a7a982e2dcacf763ace3adcbce1a29c5
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-irc-2.20210203-r1
index 2ba0e2751fa3..60752486fdf5 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c2efaeee75773beb2b6d7e0146dadffc
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-9999 b/metadata/md5-cache/sec-policy/selinux-irc-9999
index b56e39b80079..0e76773292bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c2efaeee75773beb2b6d7e0146dadffc
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
index fc2536552b5e..45f4fe1e7ced 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b5c60c19af178dfafadbb474584fedcb
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20210203-r1
index e61eefce35da..b80c0d9e839f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bf9197345379e61cd80efc9b1f0b6499
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-9999 b/metadata/md5-cache/sec-policy/selinux-ircd-9999
index 002b257974ae..2d6e6d5a4d0b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bf9197345379e61cd80efc9b1f0b6499
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
index 0d259528205a..c186bb319f00 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7586a2d54f3a001312cc9dba5af96947
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20210203-r1
index 2607846108cb..c65634a8b95c 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5c3d9797ab702da92e31d2d380b2d747
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999 b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
index e960e9609d39..4140ffa5170c 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5c3d9797ab702da92e31d2d380b2d747
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
index 9197d3542294..2432aaf2aed9 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b2f9c7925c6eef969ab729482bd96110
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20210203-r1
index 014f27147f61..ed1d49758e6b 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6297d51e7ebbd02716bf1f12ce30b264
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-9999 b/metadata/md5-cache/sec-policy/selinux-jabber-9999
index ce9c6e1260ee..92193f8f8f4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-9999
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6297d51e7ebbd02716bf1f12ce30b264
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
index a4f2be543123..da0c5be29ee6 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6d22dc4a15f7f6c5bb12499c70ee0f36
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-java-2.20210203-r1
index d2501b40bc75..27976fb08721 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20210203-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3ea98f4f95445490ec76cf49ecea35c1
diff --git a/metadata/md5-cache/sec-policy/selinux-java-9999 b/metadata/md5-cache/sec-policy/selinux-java-9999
index ac244be01b4b..8c779ca0d262 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-9999
+++ b/metadata/md5-cache/sec-policy/selinux-java-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3ea98f4f95445490ec76cf49ecea35c1
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
index 20ca5cf8be72..fe92fafb1ef9 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=df5920a974fab5c769e462b6508e3d38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20210203-r1
index c8c58a199a95..d2029c3b1322 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=64a31b9fd28cd2c5589fcddfbffa4618
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
index a413d5b1920b..c1db8e566293 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=64a31b9fd28cd2c5589fcddfbffa4618
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
index f349c2c61cb1..248b04587b73 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=49b7cc5f2991ac050095124ebd380a6c
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20210203-r1
index f60605a20775..1fbeb63b9fc7 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e844f5b3283602d138d675b071148708
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-9999 b/metadata/md5-cache/sec-policy/selinux-kdump-9999
index 124b828c6872..45115f4b6f80 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e844f5b3283602d138d675b071148708
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
index 04cb7bb266fa..54de3857ad30 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e905523775b4a32bce8f8567cea64a25
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20210203-r1
index cf71402ff803..cd5f3f4e8f4f 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=955c1d0b567027bb30b0e84fa443e8ec
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-9999 b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
index 14b1f9560019..9ca4c9a66225 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=955c1d0b567027bb30b0e84fa443e8ec
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
index 5c2dff8b1f21..bc581d1fc7bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=84bd1eef957a206f7a33a1988b29ce9c
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20210203-r1
index 3042d321a6c3..f822f0332f74 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3870b752d0e0fc4f279c64480fb10a17
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999 b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
index 2101fba257a8..274dcd156c01 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3870b752d0e0fc4f279c64480fb10a17
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
index d1a2199c954b..9bb9860c66e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f83dd7092142108b7931729e676a8157
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20210203-r1
index 6fe85a4e099f..967e1e174980 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d2ceadcff4be62cea2abd8ddcc53e9f8
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-9999 b/metadata/md5-cache/sec-policy/selinux-kismet-9999
index 4e00ad9bec8f..f6fc9096399d 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d2ceadcff4be62cea2abd8ddcc53e9f8
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
index 279b09a543a8..d361cb81c563 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a54f4bae3d32633c749a9bacf6b91af5
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20210203-r1
index 79152a28da73..d52156249844 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f7a1ea1252c304bf707b34e4660d8034
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
index 84fcc4e1adfc..18dadd9728db 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f7a1ea1252c304bf707b34e4660d8034
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
index 2bdf0e544451..b7d8461373cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5a974654b9a209f8dab0c7b65af6063a
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
index d57ceea15179..e0de9f16d4cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b1fdccd5f99f119c39407c18c8b0839c
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20210203-r1
index 7a07e1f3586c..d28cb6be8c8e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=939fe998178160ab7ca2ecb7e9cebc59
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-9999 b/metadata/md5-cache/sec-policy/selinux-ldap-9999
index 1fbb0d5edb98..7312fb3f281b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=939fe998178160ab7ca2ecb7e9cebc59
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
index d2ee1ab08e19..14ed227b56f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=be5c979e98ce64affbceda32086273e6
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-links-2.20210203-r1
index 7563eb289262..1ae02ddd72e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2fd9bf7857d90693faa0bdb95b10a40d
diff --git a/metadata/md5-cache/sec-policy/selinux-links-9999 b/metadata/md5-cache/sec-policy/selinux-links-9999
index 81a57fd3e370..b4e452609b23 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-9999
+++ b/metadata/md5-cache/sec-policy/selinux-links-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2fd9bf7857d90693faa0bdb95b10a40d
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
index 82ba6408507a..f8b800716020 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c45575d68dafe75b77d40b9f1038dcbd
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20210203-r1
index 793e712c34be..a0602daa988e 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=618985e030e5e54b04926c8c62e48e64
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-9999 b/metadata/md5-cache/sec-policy/selinux-lircd-9999
index f6bd65df210e..496831f72b46 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=618985e030e5e54b04926c8c62e48e64
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
index 034a317edbe2..1a9b2665161b 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5654007d2337ef8702330c20401ad430
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20210203-r1
index f1180f08285b..b8d4d1e8d647 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a3f95da190ae6fbd41196ba57768d379
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999 b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
index 707d715d6062..f5f67b651682 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a3f95da190ae6fbd41196ba57768d379
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
index b84fe3334505..58ce4919e891 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c37bcd53c7356cffadb73043b811852c
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20210203-r1
index fb7470b49e80..4db97f12e2f3 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ce79c28ce79db2aee2c7873674b90dd6
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-9999 b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
index 476068fdf1c6..ebd106c59d92 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ce79c28ce79db2aee2c7873674b90dd6
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
index bf8e12dd2609..be444b1065fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ac668eaf5d675a115ee88e764b0dfda2
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20210203-r1
index 5411face8c41..1faf0be1d927 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2c828ee52432dea29ec96c1bcfe6d6a5
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-9999 b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
index 8b8cb2cffbea..b2676b0f8cd2 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2c828ee52432dea29ec96c1bcfe6d6a5
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
index 65e587e7f82d..6f389e6b221f 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5b1e134e4b7bc0f235131436d0055453
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20210203-r1
index 6af127585361..53a7eccdbc16 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d74fde8842a241061e52e9ccfd36e61e
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-9999 b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
index 8de803b43f13..23e4d6339cf0 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d74fde8842a241061e52e9ccfd36e61e
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
index 5f1364c7f628..d3367d615041 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7ed7a80b3f8a147b01b66a9bf2b7d9db
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20210203-r1
index 34b6a0964fce..2c4c1b0e4559 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=482d3604c0e7ba0adbce2205d35374c9
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-9999 b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
index 42d2aac54541..82978bf69c7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=482d3604c0e7ba0adbce2205d35374c9
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
index 2944c126d9eb..b51e8de7c380 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=96923919b7955996a99c52426758e1ea
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20210203-r1
index 0569903de709..553e434205eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=420157b3467c24a29bdac062484427be
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-9999 b/metadata/md5-cache/sec-policy/selinux-lpd-9999
index 4b74365ca599..c6e390ffd938 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=420157b3467c24a29bdac062484427be
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
index 63ab09c858f3..09985996b814 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f7f47ce659126373877dabb479432c1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20210203-r1
index 138caa7f59b0..f26a096e9196 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c42d18214d779d717a05add28109db07
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-9999 b/metadata/md5-cache/sec-policy/selinux-mailman-9999
index affc99368a8c..ee711ce28bdd 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c42d18214d779d717a05add28109db07
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
index 716bd4ee437c..ce834f68896d 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=470d537abb4ea105ec9fc7e8bd4e2183
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20210203-r1
index ca969c2c686b..11a430fe3d70 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=34c0483d4ff51c4a78726ba877ff434e
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999 b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
index c56cd60a1040..62579c56c5af 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=34c0483d4ff51c4a78726ba877ff434e
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
index 5b2510c125a5..e08ab50c57f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2649754e4aa1be97834273e0bb7a40a7
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20210203-r1
index 324156ffe833..9a3c14ae34f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e7aaa90eeb4e2a2283194fce0913f731
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-9999 b/metadata/md5-cache/sec-policy/selinux-mandb-9999
index 22cd3c13930a..b63075bc4c2c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e7aaa90eeb4e2a2283194fce0913f731
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
index af90222d90a4..762e16681c70 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0bbbefbaab8fa397833a2d37652fbef5
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20210203-r1
index 7cdf6da2b0bd..92d9570e001f 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=648340062c209bc0dc580a9a1b052545
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-9999 b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
index e32b3b1e03b4..88f2e3dbd590 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=648340062c209bc0dc580a9a1b052545
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
index 9c68dc5c9e94..64b66a2654bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3cdeffe20b68570a948234fca88cad74
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20210203-r1
index fcd7b11b8283..6b80d2191ca7 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3fda29cae754512d471fb94108aa1029
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-9999 b/metadata/md5-cache/sec-policy/selinux-memcached-9999
index d716d2ee5168..c2678a43b6a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-9999
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3fda29cae754512d471fb94108aa1029
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
index 059421f34977..5c8f5e7a4ff8 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6f5cefe0aa2e001d19ab671bd55e7035
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-milter-2.20210203-r1
index 16a76a87084d..3cc6a14805aa 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=77e6fe79fdec136b1eb073747749741c
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-9999 b/metadata/md5-cache/sec-policy/selinux-milter-9999
index 60f1deb7c0b4..76aab45327a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-9999
+++ b/metadata/md5-cache/sec-policy/selinux-milter-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=77e6fe79fdec136b1eb073747749741c
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
index 0af8a5b551f4..9685ad8d5db6 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7880ecce07d5b5c0728d8758d78c19d7
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20210203-r1
index c297c43e1125..24b1b3b4aa88 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9023bb5661b91601177ec55a5895057f
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999 b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
index 698402361a6c..dbd8915c0e05 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9023bb5661b91601177ec55a5895057f
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
index b92e74d5bf80..36f1a3f99b3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e3b28ea8dc238244c394700371fba7d9
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mono-2.20210203-r1
index d64d30bd17fa..4bfb60ccf74b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e4cca99d7c75d9e72b0b19e6c603357b
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-9999 b/metadata/md5-cache/sec-policy/selinux-mono-9999
index c528bbba6c4d..e0219a837bc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mono-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e4cca99d7c75d9e72b0b19e6c603357b
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
index c3ec38252635..2994fe1c607c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6eec796d927f365e8913f3690f1fc376
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20210203-r1
index 3c019d78ae33..d669cec358c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20210203-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2175cd43e132ba46693c8b6105228991
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-9999 b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
index 3ebf148a9722..50073db1ce02 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2175cd43e132ba46693c8b6105228991
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
index fef6bd6eb49b..dd5cc14cea17 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5b001b422a3b69f0bd041085ab191f4c
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20210203-r1
index 32f3fc9a672d..78a8d7658da9 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2e3509ff3ee1d4633c7591bda83a1393
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-9999 b/metadata/md5-cache/sec-policy/selinux-mpd-9999
index d24c3a0cc702..2e83b8a34a01 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2e3509ff3ee1d4633c7591bda83a1393
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
index 4915928dc5b8..47ff49626a3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bb0a0259f4069000df3671e750962ea5
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20210203-r1
index d5b559d0e03f..3b3762d16461 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20210203-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0f0fb512a8c17ed8be88e9e499a7f550
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-9999 b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
index f1a95ae4f314..515c47f3ae7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0f0fb512a8c17ed8be88e9e499a7f550
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
index 1f39858e3662..5d8d8fd8876a 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=05a7f5dd9a392920133a602c625e2ec6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20210203-r1
index d3ed1f8082b0..5432a119ecf2 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dc68fb4ae205dfb1eebab9f34eaddca2
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-9999 b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
index 90c6b6dbf1b2..850bc5b5c186 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dc68fb4ae205dfb1eebab9f34eaddca2
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
index f7967ad25311..58fe909bd173 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=efa1f8d0c59899e636ffef8f5d9b3b9c
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-munin-2.20210203-r1
index 88edf3f6f56d..bf11cb267bee 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d2b6c71a542e9926001cfaa88deb6063
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-9999 b/metadata/md5-cache/sec-policy/selinux-munin-9999
index b24ae985a462..f0fc69ea442b 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-munin-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d2b6c71a542e9926001cfaa88deb6063
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
index 3e171984cb9d..6e67fb0283dc 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b70d79b8d433fcfcbcf82492d29cf2fd
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20210203-r1
index 6b7f65a80409..40b6b21a5c9b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=862a4cdd984bbeadf53b36aaa2ef572a
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-9999 b/metadata/md5-cache/sec-policy/selinux-mutt-9999
index 40f1e65f4963..47c75dadf170 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=862a4cdd984bbeadf53b36aaa2ef572a
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
index bfd123bff483..eff7999c378f 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f66eb3068bdfeac739c1d0d863bed417
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20210203-r1
index 945d07376e70..d15e1128fcfe 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9e5918806997dfb598986e14b396b5ee
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-9999 b/metadata/md5-cache/sec-policy/selinux-mysql-9999
index b99d3cc8b1ea..8064e62b800b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9e5918806997dfb598986e14b396b5ee
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
index 9db6b4bdade0..c94fa0a804cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=88ddb86f9635aef6efcbc8674e7400da
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20210203-r1
index c938cfbd5e97..d41c890dc293 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e5040f709b18d28543d78b4638d7ec07
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-9999 b/metadata/md5-cache/sec-policy/selinux-nagios-9999
index 13f28abe4960..7428674c4833 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e5040f709b18d28543d78b4638d7ec07
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
index 1d55913306fd..f26bdbd5031a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e89f25d171827f7ad311e9db1ea74aba
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20210203-r1
index 450de7b0c911..61cd564bf83c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=23df6ebc910c25f1a6a3dc7e38f46c29
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-9999 b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
index 8b4ba8794c91..c135b127175a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=23df6ebc910c25f1a6a3dc7e38f46c29
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
index f7040415c535..094993bd2fef 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e58fb7d812e0cbbf1806eb0c1f552539
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20210203-r1
index a75c71b90b73..0f4c94dd14cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=32dbee8cb8d9c8b4628d010aabd43825
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999 b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
index 1526f2702eb5..fb093a5c3348 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=32dbee8cb8d9c8b4628d010aabd43825
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
index 2a2c61c7a815..8f5352b6d693 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7b21b72697eadd028fc8b752511904c3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20210203-r1
index 56bb58fceaf7..2e59241631cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e00f0a0d489f7bb385c6f877f4eb2d7d
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-9999 b/metadata/md5-cache/sec-policy/selinux-nginx-9999
index e44a367dd1e9..6cecdc416196 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e00f0a0d489f7bb385c6f877f4eb2d7d
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
index 090d7806a31e..0835a97212b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ae0de5f56f4768858d46d795fe4521c9
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20210203-r1
index 359e6578c477..4ff5534e797c 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0438c567296c193dbca07bf0ebe46c16
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-9999 b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
index ac3ac092869d..9841a3b8434e 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0438c567296c193dbca07bf0ebe46c16
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
index 767637dbe2ea..6080143cac65 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b227f25f597ccdaa27454d6101af1f9b
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20210203-r1
index 7fd2bfdc9013..444369b8f55f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d3ae3bdca95b4f20f100469211c4a549
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-9999 b/metadata/md5-cache/sec-policy/selinux-ntop-9999
index 1df4d0e05689..9d40a4ef221d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d3ae3bdca95b4f20f100469211c4a549
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
index 7e3d80cce0b9..412c4a8061c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1229f773fe3319b30ac61ee5f8fe35d5
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20210203-r1
index 51aa5675731a..b0b9f939a4a9 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d0a95e442f8125b6162aa09de69d1741
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-9999 b/metadata/md5-cache/sec-policy/selinux-ntp-9999
index 18e75be83136..c7a4bbc6f1a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d0a95e442f8125b6162aa09de69d1741
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
index d61f7b09c003..0b19f904976f 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=922c85a249a2a0b036cc81f96f4ad13e
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-nut-2.20210203-r1
index 176f85b0782a..e744b1612756 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3fc7f6e42479e0664345288298d998d5
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-9999 b/metadata/md5-cache/sec-policy/selinux-nut-9999
index 1914192bf641..61b4116b9327 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nut-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3fc7f6e42479e0664345288298d998d5
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
index bbb79d49ea37..ead1a920b943 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=aa10c9b9e9606ca67a8175ebb550afe5
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-nx-2.20210203-r1
index 8d8ba32016bb..f6dd5bb58b1a 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b1222ad4291a224271f863424a5fae1d
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-9999 b/metadata/md5-cache/sec-policy/selinux-nx-9999
index bbbe656756a9..dd7e2086e9d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nx-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b1222ad4291a224271f863424a5fae1d
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
index 19cd650677eb..ed5fa37bb66a 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b0224f7fd6dddb68a226f437259ae570
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20210203-r1
index 162308e98a95..1538641a5804 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=355b7d1f1915c1b6fe8555c564cb9615
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-9999 b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
index 938dc57a9606..adcc9f159c4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=355b7d1f1915c1b6fe8555c564cb9615
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
index 78c01a8b6388..7817da97908b 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a3dcdd4e6e35114e40fa9723cddaa568
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-oident-2.20210203-r1
index 3e3323b20482..a2b33537cc01 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=400267fcdb8ae7ca1c8266d577bc0d63
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-9999 b/metadata/md5-cache/sec-policy/selinux-oident-9999
index 3a5a26f0a1e5..8cf042a225cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oident-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=400267fcdb8ae7ca1c8266d577bc0d63
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
index 727702f891e2..779deb3af4b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dbdc2a73ef7cdb2c3e6aef1a1a339ba8
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-openct-2.20210203-r1
index adf7042080e1..56be551b73b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=88f65e12112dab816b636382379cc036
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-9999 b/metadata/md5-cache/sec-policy/selinux-openct-9999
index 6903af60f854..a883c9678ffb 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openct-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=88f65e12112dab816b636382379cc036
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
index e035d31b3a7b..bf98e87a1ccd 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=34e340dc71afe70c345f7b4a95a9dcd1
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20210203-r1
index e0f53f59e28c..12d1b6aabe0b 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0611482c9665265934d1bb04b09adaec
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-9999 b/metadata/md5-cache/sec-policy/selinux-openrc-9999
index e61c4e7d16b1..4e0fa6876592 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0611482c9665265934d1bb04b09adaec
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
index b8f9d90bdf3b..b9608dce0e7f 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=aa981c56e743f931743bc355707242da
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20210203-r1
index 878fa5364555..611de2cf6337 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0e7d1f952737322c16eebe1841dccb18
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-9999 b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
index c586525a242d..b0171b3135e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0e7d1f952737322c16eebe1841dccb18
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
index 9833362d820c..2846421dcb7f 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0d7c289939b4de2cbeb02f6a8e26793b
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-pan-2.20210203-r1
index 17174811ac17..47c88210b977 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a679c907cf9233a402695cb2669db407
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-9999 b/metadata/md5-cache/sec-policy/selinux-pan-9999
index 45f064a66ddb..118272a9553e 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pan-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a679c907cf9233a402695cb2669db407
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
index 21bda17f5014..64d2e3b34532 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fa589fbd9ea376e29aa0edc6732ab8e9
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
index 2c69bf6bc499..773b3d5a3c56 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1446382dd6b3a601db9dac9208fe46c1
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20210203-r1
index 31f0097c3c6f..30feb33a75b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=adadf68bf5b49b002f6bcc8f8ebaf82b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-9999 b/metadata/md5-cache/sec-policy/selinux-pcscd-9999
index eb5f6910e8fc..fbf618940808 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=adadf68bf5b49b002f6bcc8f8ebaf82b
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
index 514b319c7809..cf17b6520d89 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3dc71583c346d2fbf2db9538e101de27
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20210203-r1
index d63e6e0d058e..cd69e1e8c788 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=da462132a163c250e75cb102f764c7ff
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999 b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
index b54f59ae5fa5..5aeee3c90987 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=da462132a163c250e75cb102f764c7ff
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
index 58c88bfeac98..64baf62068ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3112f60215c0e93e1bb41dc4e07a0a83
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20210203-r1
index e2e61fb23eff..e62e7e6de4ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f866f04329b764a141d107efa053debf
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999 b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
index b6e01f2d9b59..1f69cabe4f5d 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f866f04329b764a141d107efa053debf
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
index d4afe6bf1a55..71af01a241d9 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0103a5089964c71f8c27e5f5952b35f0
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
index b854b8ba6c68..ba25c97b60f6 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7aa043badcfb4ba5cf769e554ea314ae
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20210203-r1
index 0a492eac938f..ef2b5f07ff5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=56f11daf534a1ea3080abb431babf6f3
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-9999 b/metadata/md5-cache/sec-policy/selinux-policykit-9999
index cc9999c286a1..012884ff69fb 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=56f11daf534a1ea3080abb431babf6f3
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
index a7010905c42d..0642c5bc6c00 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=49d59bfca72a638a5bd868ba8cb84b7d
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20210203-r1
index f77a3a977cc4..b2543566000e 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b258e5638f5a66289616c342ee31cf63
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-9999 b/metadata/md5-cache/sec-policy/selinux-portmap-9999
index 7f64838dc5df..f4c4ed89f1c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b258e5638f5a66289616c342ee31cf63
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
index 19194b41bb43..33f6f85fa98d 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0577d93e002a68dfff5399a2081ac2ad
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20210203-r1
index 7b92955f14f5..fd2ff17f54a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b889c8974ad49804c8fa91265a7491a9
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-9999 b/metadata/md5-cache/sec-policy/selinux-postfix-9999
index 2fd5e8906cd8..bdb52be3c80c 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b889c8974ad49804c8fa91265a7491a9
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
index fe7da3fbf4dd..af559c69faee 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fb3832a9ceb19e847f4e214750f8e282
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20210203-r1
index 2c6b4b3bc587..008774a2230a 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c15295a2d112811275a760ed48ab139f
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-9999 b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
index 9ff4d9cc4a5e..dabdd525d6a5 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c15295a2d112811275a760ed48ab139f
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
index 2665b99dd771..3f7553bc53e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b345a774c01a834c6fe1cea84a1206c6
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20210203-r1
index 191d53314261..effe7d7b42e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ae85dd5b19605cf5bc1784cea9bddb24
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-9999 b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
index 560697fd946b..a6191fb2168c 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ae85dd5b19605cf5bc1784cea9bddb24
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
index 38528e4e1dcd..bc1d3fe1497c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=aad408466ea098e4ce329013584bc51b
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20210203-r1
index d87ec8e59144..3fd98e06e713 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8a2e085c0eeabd7110993b634004edcf
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-9999 b/metadata/md5-cache/sec-policy/selinux-ppp-9999
index e8fe122c5cf6..e3e37e457575 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8a2e085c0eeabd7110993b634004edcf
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
index 1b105ae30b83..3dffc4e896f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fe9dc540bc38c3f48c7f5441f3430f82
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20210203-r1
index f04d1e73761e..db2696e95785 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=330fe291e3a34b9e9c882d8178eef17c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-9999 b/metadata/md5-cache/sec-policy/selinux-prelink-9999
index c5a13d6bb51e..cfcb49ad973f 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=330fe291e3a34b9e9c882d8178eef17c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
index c5bcdcad774c..f63e5f07b1f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e1b19bb23ca408ada6c5b8a1c0aa2404
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20210203-r1
index 9a8fffb033a5..a4498880a2d8 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fe8794f424749a47636fbdcd57f7060e
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-9999 b/metadata/md5-cache/sec-policy/selinux-prelude-9999
index e5cf9b193c54..b2d857620652 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fe8794f424749a47636fbdcd57f7060e
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
index 4c45bef81698..19ddc2825b5d 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1f3a9e0411c245ae7096afd5476c7aa6
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20210203-r1
index e83258c2ee6a..73f399fb22a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=90a362591661cd03e59732ff4c2cf26c
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-9999 b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
index 43f4e1672ce6..8314e488525a 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=90a362591661cd03e59732ff4c2cf26c
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
index 2da3e3c3c0b0..70cf8be0f4b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f838a44610fa2a73f497c9251a0c98f3
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20210203-r1
index d123ff1fa4e3..9362ca034116 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f7cf8e838b0a0574a192f3673d90623b
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-9999 b/metadata/md5-cache/sec-policy/selinux-procmail-9999
index ca3a4ac35a00..0dcd53eedc64 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f7cf8e838b0a0574a192f3673d90623b
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
index 8399b39dc1cc..4daba551e0c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ee310b838bc9ccb2a97f7006b2edc928
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-psad-2.20210203-r1
index 0bee166d8d0e..2e3fc7a11680 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=65c6577463076cdedd91223c8c154223
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-9999 b/metadata/md5-cache/sec-policy/selinux-psad-9999
index 86aefe45d0ec..c43edf94b8d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-9999
+++ b/metadata/md5-cache/sec-policy/selinux-psad-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=65c6577463076cdedd91223c8c154223
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
index 1bea24ecfa23..150473d85853 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f3265b3ce8e21822391c92a336cf813c
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20210203-r1
index d36012d0da81..ce5b4d583444 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b8f3065f8d48820085e522aaae4de115
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-9999 b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
index 4b0a69fa0d2d..0e84ec37c8a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-9999
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b8f3065f8d48820085e522aaae4de115
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
index 83e258fd598c..5eb9724fd7b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=830ce888d15afffdab552834a25692e6
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20210203-r1
index 91fbb76cc021..c12f8dd7ac50 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b235e161ab368fac9bc2d8749dcc77f5
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
index e60ad06ab611..bb2a5548779d 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b235e161ab368fac9bc2d8749dcc77f5
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
index ba67de9eb3c7..3b8f99112211 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=51afa2dd30d02b9986f6c4a8c6a3d9f2
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20210203-r1
index b7edbc18cd73..262649fd32a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=80c0bca972cfc4f54b49c5acd6768ff1
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-9999 b/metadata/md5-cache/sec-policy/selinux-puppet-9999
index c0a87ef70c2d..aa03d6b1e8a9 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=80c0bca972cfc4f54b49c5acd6768ff1
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
index 9ca0401032d3..3850537123b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=65daec7c05bb9a95d393b85ed7555511
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20210203-r1
index e28aa82baff6..4fdd962dcd4b 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9da3404f25e7ff0693ec44aec296e9d2
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999 b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
index f544b33ac071..8a02bd4f740b 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9da3404f25e7ff0693ec44aec296e9d2
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
index b0a29babff21..b9cf047e6a16 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5cb7e667352121ee26bf4647bc2235c0
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20210203-r1
index 918350a9b0ee..c631c8118d7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bdea651f158d935fa2fb7a126ef344f6
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-9999 b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
index fe52a0628e0e..29543ba49ab1 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bdea651f158d935fa2fb7a126ef344f6
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
index ced5dff8f104..96ba1550f72a 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2ca4ef47595b77ed603d7136ca55f175
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20210203-r1
index fe83323a56e4..445d59f9b815 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c28f5404492af6860395344bc5761f80
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-9999 b/metadata/md5-cache/sec-policy/selinux-qemu-9999
index 0f97006122ea..b7c5a2c13a15 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c28f5404492af6860395344bc5761f80
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
index f661971b0f06..bd77a70d0d86 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f46666857759b921919c5c8b3ea17be8
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20210203-r1
index 24b416dd2234..226265b5dd04 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d1533ac4c7f712aeb32eaec00337d7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-9999 b/metadata/md5-cache/sec-policy/selinux-qmail-9999
index 54d856d7cb25..de8d82dcdecd 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d1533ac4c7f712aeb32eaec00337d7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
index 329eab702179..449278acf750 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9d42760bed1edfd66e1aa0fcac93fff8
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-quota-2.20210203-r1
index 923e4751d010..88caac875405 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=be02b1627c3a40811956bf28165ac5f8
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-9999 b/metadata/md5-cache/sec-policy/selinux-quota-9999
index 7d013afaf6ac..a4d85210a810 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-9999
+++ b/metadata/md5-cache/sec-policy/selinux-quota-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=be02b1627c3a40811956bf28165ac5f8
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
index a0e09dbcb056..1885ccb05ca6 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=51ff1bdcb127c230fcfe8cf95a3665b9
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-radius-2.20210203-r1
index 9caf54ae7c91..1a91b00047ac 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2d3f8fa99fce9bd48b9a2336251d1aa4
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-9999 b/metadata/md5-cache/sec-policy/selinux-radius-9999
index ead89dd3be28..e63507f1a19b 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radius-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2d3f8fa99fce9bd48b9a2336251d1aa4
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
index 5cbc0fc0fdeb..fcef5b8b74a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=08b4a436d5e8f2f08419f95b59e3a610
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20210203-r1
index c2e220a2636d..168b53b361b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=da7dbb7f4b7f6e8ec4e8161261378e2f
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-9999 b/metadata/md5-cache/sec-policy/selinux-radvd-9999
index 298994791873..02cc86aa615d 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=da7dbb7f4b7f6e8ec4e8161261378e2f
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
index 03143ba51f0f..993f18ec4f7b 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=719227f4160bf62211a34b9997f89215
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-razor-2.20210203-r1
index cbb5519e80f8..5587d3013d0a 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4fcf8583ec4b52f8a33a851f6d981373
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-9999 b/metadata/md5-cache/sec-policy/selinux-razor-9999
index d9102e5ea0ca..dc2208437519 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-razor-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4fcf8583ec4b52f8a33a851f6d981373
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
index 95598d488a53..0c4060002309 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f6a1b88aa045f9f3647c151d946d7c7f
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-redis-2.20210203-r1
index fed5952a268e..dbdf0c248069 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d138f38804e0ce4ad526decd5ebf8931
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-9999 b/metadata/md5-cache/sec-policy/selinux-redis-9999
index 73cc3a26ce2b..06e992bd6b14 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-redis-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d138f38804e0ce4ad526decd5ebf8931
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
index 186a55696a66..1e885b628f61 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=67aa1da649941ec18c47b3628a471a0d
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20210203-r1
index 50b51eb8fcbf..e78bb60b1d2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8a57c80628cee336b9345e5a87705e64
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999 b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
index 9c8071c5ef7b..115783e9f059 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8a57c80628cee336b9345e5a87705e64
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
index 33c305998a8f..f5318062219d 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8f0de2eec678f54ce1620d1c0d9e95f7
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20210203-r1
index 6ea8cbc1d661..0646765877a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1a724fc30fb0d054e98d434a0d1850e5
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-9999 b/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
index 1f9c99201aaa..7c0fe2aabd57 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1a724fc30fb0d054e98d434a0d1850e5
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
index b46bb90aa702..09d565df4fd4 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4f3ad12a404b28e9cf8a86124c3d47b0
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20210203-r1
index f90f190fcf1b..3704c8457abf 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=08b0f42b567a0378df55e42d1a3aead9
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
index c0789d9ec068..4e48f7c6657c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=08b0f42b567a0378df55e42d1a3aead9
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
index 3acff75ff285..f7f66596640d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f0adb21f1039b04d4f5bc9886514f2ab
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20210203-r1
index 52731e2f117d..36e2bd931b04 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8eb2ef1e3bf4ec0ce54cc5ee5d78bd65
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-9999 b/metadata/md5-cache/sec-policy/selinux-rngd-9999
index bbf8464f29f5..c1cd1283829b 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8eb2ef1e3bf4ec0ce54cc5ee5d78bd65
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
index da4544a9b3e2..9313bbed7881 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ca64e3c785343b32a85ba6dae2750606
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
index 2866f109411d..8b2174140da0 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e09220bd348bfddbd80f870553c4e540
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20210203-r1
index bdc5e553e7e2..f72365f5ef92 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7cef000bc1c5a976ac15a8e136f168cc
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-9999 b/metadata/md5-cache/sec-policy/selinux-rpc-9999
index 7deb474e9bef..0aaa10c647d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7cef000bc1c5a976ac15a8e136f168cc
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
index 3d8f575e4676..bbf8d50c92b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e54baa9705d595f071e6b32c9ff9fc98
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20210203-r1
index 3d87a6a7436c..57163dcde820 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5c5ec9daebfea593ca59d8a98bd63e82
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999 b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
index 6bff8ef67f5d..285f38032c01 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5c5ec9daebfea593ca59d8a98bd63e82
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
index 0926fec775ff..534c41f1cf03 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=86c264fbf4505690a89f63aa3a1e01e1
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20210203-r1
index 1e736bfac3e0..cdbce20b4769 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=04acf86f4622661f79342d3417eda081
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-9999 b/metadata/md5-cache/sec-policy/selinux-rpm-9999
index 0c837fad08b9..2b440981ab93 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=04acf86f4622661f79342d3417eda081
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
index f8995f056891..c1d96b930787 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=13836502305a59c0e73b108546c1ef12
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20210203-r1
index d3357bcfa69f..52ef7ed21eba 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7dd80a6a8fb365c5e79fac27c7b895ce
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-9999 b/metadata/md5-cache/sec-policy/selinux-rssh-9999
index eed1ac369b1f..e871dfa5828a 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7dd80a6a8fb365c5e79fac27c7b895ce
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
index 659e1f4cad15..637b3c4ca556 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a943eba1316e77add036fb4a25a25baa
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20210203-r1
index 6efd283e6d5f..4bc9f40b847c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2199337b7c70ce0fa965d835887dd044
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-9999 b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
index 9a93cf92c4b8..c443bac3fa4d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2199337b7c70ce0fa965d835887dd044
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
index d5c8c4b2168e..4ebfc7221d8a 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d734774b95ab15ad7302721e8cb88031
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20210203-r1
index 6f0543600c68..eea055b38256 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c66fc1e8ea8025bf58820a84a2441dd4
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999 b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
index 2082b32f1bfd..cfa12cd707f8 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c66fc1e8ea8025bf58820a84a2441dd4
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
index 549cf935b3ac..94a176e606d4 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0a5d4f444b43aac5419e83f2e9648aaa
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-salt-2.20210203-r1
index e8fd1ffb8e10..04aa8549bae5 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f37b53e854c96161a653521379148301
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-9999 b/metadata/md5-cache/sec-policy/selinux-salt-9999
index 7f996306442b..e10259892e4d 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-salt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f37b53e854c96161a653521379148301
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
index 5490a29f200b..b81ec5c49901 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dd22ba6352eaea6ef75045c83f45ac73
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-samba-2.20210203-r1
index dfd93ddbe7ac..e5f908f2cb42 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=98b10e85be6dee91f62ebd3c895d6648
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-9999 b/metadata/md5-cache/sec-policy/selinux-samba-9999
index 5080f02df1ff..af71228bfdbc 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-9999
+++ b/metadata/md5-cache/sec-policy/selinux-samba-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=98b10e85be6dee91f62ebd3c895d6648
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
index 45eb81388d47..13ecc7f1d28e 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f9cbf02cb3243453ad77add90e5306f5
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20210203-r1
index 87e2d0a7c718..606daafcf03f 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=310ddd7bfba7b126eb9e97741ba0fac7
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-9999 b/metadata/md5-cache/sec-policy/selinux-sasl-9999
index 769854ee263a..ca9e63dcf75d 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=310ddd7bfba7b126eb9e97741ba0fac7
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
index ba964538fa11..df6fc2c075aa 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fffbe585043c85d9bc1f0b3d7dd139f8
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-screen-2.20210203-r1
index 66fa74f581b9..1851a0270d8c 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=33d0aaf7d3d12e10b2400060409a5282
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-9999 b/metadata/md5-cache/sec-policy/selinux-screen-9999
index b8f1d599a64e..9772c9c9caf4 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-screen-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=33d0aaf7d3d12e10b2400060409a5282
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
index 4704016974e1..593cdda67b13 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6277265e5768c5e07670f4984d1ec857
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20210203-r1
index 9f06e34980e8..a693fb4fa5f8 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=73b194e4bb19b1ab42a7431359cf2951
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-9999 b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
index 3f1823c2b2e6..513b1398821c 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=73b194e4bb19b1ab42a7431359cf2951
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
index 8b786a4f4223..2976ca71b372 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=92c2b6096ba2c0732ae687cdb1f8cff2
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20210203-r1
index 602a93bad8a3..e3598d367fa6 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7616a512fe6e9cd48c77b2f5cb18d609
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-9999 b/metadata/md5-cache/sec-policy/selinux-sensord-9999
index 479be4736d4f..8513cb865739 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7616a512fe6e9cd48c77b2f5cb18d609
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
index d5cb0cb55017..b329e959e31a 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fa4c2a19a7f75b7b8c0e160e17323169
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20210203-r1
index 7b4bb0586087..ae0c3d36f7ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=39447ac6e885b8df37a7f547b53be312
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-9999 b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
index 49be3aad53ac..fe8fddcdb44b 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=39447ac6e885b8df37a7f547b53be312
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
index d4a5c961e75d..6e515579d981 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1aa3e01ccc4dce9472bdaf1ccbed8668
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20210203-r1
index 4575213c8857..17ed0fb68091 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16b77b67dc6881a21299c74ad37f14fb
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-9999 b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
index 6804b4410724..c73d4ca5c3fb 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=16b77b67dc6881a21299c74ad37f14fb
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
index d69625351e4f..f96a248dd2d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5225dea4cbaa6de9ea566d2033a67186
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-skype-2.20210203-r1
index 896b1dff048f..4a60867fe5b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20210203-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=54f48003db38cd8fdd9ff8e721dfeb6b
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-9999 b/metadata/md5-cache/sec-policy/selinux-skype-9999
index 1093b3b1f89b..bdae81723101 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-9999
+++ b/metadata/md5-cache/sec-policy/selinux-skype-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=54f48003db38cd8fdd9ff8e721dfeb6b
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
index 7ceffa15e0d8..d2acb090f30f 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2a0fbc8f8b253aeafa954e00c6aa3580
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20210203-r1
index b9cbfcae0f76..a767453076c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=84d29e90e1dfe8429715e1661e511506
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-9999 b/metadata/md5-cache/sec-policy/selinux-slocate-9999
index 1ea73c8407cd..0d49eae9ce29 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=84d29e90e1dfe8429715e1661e511506
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
index 21525de9702e..6d51e922ab64 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d63bcf1e4ec3fac06fc3790c1e0fe52e
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20210203-r1
index 22f8d3888cd4..e1a1541ea3fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4abd39a3c43b0e4ea7bdc8fac93910df
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999 b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
index 15f251a83078..b781165e03a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4abd39a3c43b0e4ea7bdc8fac93910df
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
index b8757d835a2f..c8041127f7b4 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=197a096129bd2838f29546a8ea24f1f1
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20210203-r1
index 438415b59eed..ecbd99079a1d 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5f70d90d250b2b207bd959c4fd9910e2
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-9999 b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
index 5d3a05ddd496..38e34e99b648 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5f70d90d250b2b207bd959c4fd9910e2
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
index a6949abc5866..6949c98784f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=66a67a2f8fee6853e01c046db0173012
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20210203-r1
index 8420e9cb1840..fc06abd35392 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b2c175f02f7e54955379cbfea4e86ad9
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-9999 b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
index 0ac7a1259b75..2f3fc6168693 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b2c175f02f7e54955379cbfea4e86ad9
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
index afe8990cebc8..9a21c5cfde0f 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e25b3b2573b89be5ebe1c87d7663272d
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20210203-r1
index b028143efe9b..932cb36e7d47 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6a6b9abaca28d33f05a2708791ce2374
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-9999 b/metadata/md5-cache/sec-policy/selinux-snmp-9999
index a8e812287a90..cf2105081b32 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6a6b9abaca28d33f05a2708791ce2374
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
index 56672ee07e06..2445c71a6c3f 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f7beb9e85262d2f0ed89ef1d4ce38e22
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-snort-2.20210203-r1
index ee67703691e2..431a7c14f431 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e8c8939bdb972edcd92f0b3774289e88
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-9999 b/metadata/md5-cache/sec-policy/selinux-snort-9999
index 275c0e1e7760..2b90a5cc5216 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snort-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e8c8939bdb972edcd92f0b3774289e88
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
index 574fcb8452e8..c16dd1297d0e 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9610fa89bfc633a0fd54c36830c01cd4
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20210203-r1
index 7b3f112bf266..d4746664b515 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=19351211031c4133166af4308b14d716
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-9999 b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
index 16f5443b0764..e74ef3c148f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=19351211031c4133166af4308b14d716
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
index 455eb0e28383..451ce3087057 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=adaca643d0022491fd418dc555b50189
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20210203-r1
index ff7631ea45a5..bd9168a9f9c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a58e36e67de1e160d88f34fac7c87e39
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999 b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
index ade28cc923ff..be41df841629 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a58e36e67de1e160d88f34fac7c87e39
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
index f8171dce8781..c3b4f9789552 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7c94036624d4ecf53cf924b35924c435
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
index e3c0a15ee247..ed74141136d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=39516b88aa6646f04bb02512c569c394
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-squid-2.20210203-r1
index 24bd94f67183..273675854802 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7d8bb6a6403c0f4484f1aaebd8d1c50f
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-9999 b/metadata/md5-cache/sec-policy/selinux-squid-9999
index 81e079fdcd7b..dd85330e44d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-squid-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7d8bb6a6403c0f4484f1aaebd8d1c50f
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
index f1af9f6cff72..e333de399f14 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=efa610136fa5dce9b3fc64b9a71b2e33
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20210203-r1
index 7faad4e05654..922a778ea522 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c1ca613ae24701ea2a6fee7bf48104b3
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-9999 b/metadata/md5-cache/sec-policy/selinux-sssd-9999
index 3c44509ffda4..58111fd5a824 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c1ca613ae24701ea2a6fee7bf48104b3
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
index f97f921137d9..349e6d8630c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8ec852e0f1b0cba86572b6338b5aa743
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20210203-r1
index 2154a6418f1a..05432fa67227 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2d55bc8d82766fcfe9c3fb5f9f0377bf
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-9999 b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
index 1afaad6ed510..13dee90df3f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-9999
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2d55bc8d82766fcfe9c3fb5f9f0377bf
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
index a62147bc78fd..bd11f921db68 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=b11a2906d1d599b64accaedfc67d7a87
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20210203-r1
index 8115b56a87f0..d9f2f3bff357 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=955620a33ac70e39664c8f23bf10d72e
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-9999 b/metadata/md5-cache/sec-policy/selinux-subsonic-9999
index 96df0f7d8014..9ab0bdc6712b 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-9999
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=955620a33ac70e39664c8f23bf10d72e
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
index e01b81db040d..c8eb9ee7604a 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=51ea61b461ab2b0e6877ea758eb33f86
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20210203-r1
index f16eb9396f44..5f3a38cecabb 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=41292085447acffd796777ffcd556657
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-9999 b/metadata/md5-cache/sec-policy/selinux-sudo-9999
index 9ab492de6e5e..b7cf61a8212b 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=41292085447acffd796777ffcd556657
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
index 9c5f1e1f60bd..d1fd6c4357b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=29dcd11bf71ea4bacb20c4958f3e8f40
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20210203-r1
index 09f53f5ee550..b4feae5f5fa3 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=437a37cb6eb963cc563dad1efc7d47f5
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-9999 b/metadata/md5-cache/sec-policy/selinux-sxid-9999
index f17ef4944525..49018f35ad09 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=437a37cb6eb963cc563dad1efc7d47f5
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
index 66545976107f..ed6359710d61 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c1468f85803d809376cffd8d1cc51503
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20210203-r1
index 9103a217c0d6..cd47ed5c92bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3266f1b10a0363f8c83d1ba1d36a066b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-9999 b/metadata/md5-cache/sec-policy/selinux-syncthing-9999
index 473773da712e..c1d3bfdc652a 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-9999
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=3266f1b10a0363f8c83d1ba1d36a066b
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
index 49c61a7fca20..14bb0dfca9d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0b39b5507e29bb132e060796a4ddd62c
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20210203-r1
index 5634e625e167..b036da9cef8e 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4ef8c8518bc1850c0a3705ef1542654a
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-9999 b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
index 6b5c492ebd00..a84da8fb5c5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4ef8c8518bc1850c0a3705ef1542654a
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
index dfe2257e3a83..a01ea698f58c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dd393cac701f6a74d08080782bf2ff72
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20210203-r1
index 6cfdcd4b1ce9..6524686cdd35 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ff9c71022d8dc659d9b82537b2372183
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-9999 b/metadata/md5-cache/sec-policy/selinux-tboot-9999
index 7152da20ce7f..dd4b9f6b08ef 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ff9c71022d8dc659d9b82537b2372183
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
index 6c4aaaab39d7..adf49a868d48 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dc193a42b06d0478a797afc0f8debd2a
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20210203-r1
index f73c1c78aa54..8876542d8146 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=daf42ad57856ad28e7c59f95bd4e0c9a
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-9999 b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
index 20601498618a..f190a933299a 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=daf42ad57856ad28e7c59f95bd4e0c9a
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
index d8a6132bd364..5cfcd114cffd 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=91bb3cebfb0bd563d05e67d027306f2c
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20210203-r1
index f3317b463222..1d134066d613 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a139dccc5d56a15ce47b0cf8387a0b66
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-9999 b/metadata/md5-cache/sec-policy/selinux-tcsd-9999
index 63cc7ce7c68d..12e445657cfb 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a139dccc5d56a15ce47b0cf8387a0b66
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
index 75cbdbcb6fdf..4e5fc8fa0818 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c88832fe3cc8a54b6b4470ddea8bbea1
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20210203-r1
index e461577b3e2f..b1818f5f892f 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=39303436d8cf7e8b16b62a9e7afa60b6
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-9999 b/metadata/md5-cache/sec-policy/selinux-telnet-9999
index 85f3093e3537..560e0e601336 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=39303436d8cf7e8b16b62a9e7afa60b6
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
index 94023056e879..2a2c72595e1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=df48208e4c7de3e09b5b0ef1f5b67df8
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20210203-r1
index 18130547f3b9..8f8f9c4c4d36 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=69e03f356f812fcc7bed6614c4227646
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-9999 b/metadata/md5-cache/sec-policy/selinux-tftp-9999
index 7b17d32ca1b2..58cc0b955aff 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=69e03f356f812fcc7bed6614c4227646
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
index 52984e819562..f308467013dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=938207644a20d0a5b7253b97dda9cf4a
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20210203-r1
index 1b620775a49a..092e3ecc24c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=cceefc62ec9064bb3e6fee18d01ffeaf
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-9999 b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
index e4964cb25a90..b53e08e581b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=cceefc62ec9064bb3e6fee18d01ffeaf
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
index 038e733966cf..10995623e8a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2026b95030c30b451d5818ae82130c79
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20210203-r1
index 2b8743e7dbf5..fd2d02558c6e 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ed85ee61d49db98ed23483c2269cd4a6
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999 b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
index dec3fff4df1a..ee781e22bac4 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ed85ee61d49db98ed23483c2269cd4a6
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
index d6133f4a2a3f..637605b8f7a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=ec412af2245cea10acdb7a20d1560d90
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20210203-r1
index 1a0f010497d4..ed637f09de55 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=71279c70d669172786721b5019faf114
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-9999 b/metadata/md5-cache/sec-policy/selinux-timidity-9999
index 084430d80258..faa093cb0a8f 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-9999
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=71279c70d669172786721b5019faf114
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
index 3a98d8c7bcde..0b751b5aa869 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8511e68be07c2891dcfc6e3f40ecec76
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20210203-r1
index 96968e7c6507..4e180e474f39 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c9bd0d86f0fffbad52f9e94222fe2763
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
index afb4d5284f54..67f306d43196 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c9bd0d86f0fffbad52f9e94222fe2763
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
index cd50900d7ecf..d0fe9e0c8fe9 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=50ea4902e2715418764c2d374d7b16bb
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tor-2.20210203-r1
index 97c205627c39..06bf12e807b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=23a9f367990ae3d78b73b92604de0964
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-9999 b/metadata/md5-cache/sec-policy/selinux-tor-9999
index 422fc32048ad..105ef079c833 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tor-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=23a9f367990ae3d78b73b92604de0964
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
index 5336f0f3e16d..d62a7c128e6d 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=db89de0b0059e2373201c1bff61eea37
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20210203-r1
index 015048b2048d..b24a5a0fae5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bb2241a8892fc793bc52e9c4d8eb3fa9
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-9999 b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
index e46aa824328e..732670a93967 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bb2241a8892fc793bc52e9c4d8eb3fa9
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
index cd15fad9ad7e..8e8910c72391 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=aa65b3887e762e671df900ea5fe2d50d
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20210203-r1
index ca0f4588be99..9aa28b688270 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e907b65ac37f014bdf132c4671e113d9
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
index a967d8192e8b..cb14b949bf32 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e907b65ac37f014bdf132c4671e113d9
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
index 211888d912d7..fbbcc96c469c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0ebd3224d07ea0b3630779e50afcb700
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20210203-r1
index dd26f7a13bd5..c9bbec0d123d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=db5b03a6bb3fbbed8d2e2429dfeeb45c
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-9999 b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
index bd28ccae3da4..98d98b2dd361 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=db5b03a6bb3fbbed8d2e2429dfeeb45c
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
index e05f8392f19f..51d6d09c2878 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=96c079f59c2b571630f1f1d26c7eef5b
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-uml-2.20210203-r1
index e34290fcfae0..258059ed4f07 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=392e6d16002df89d79abdfff6f361050
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-9999 b/metadata/md5-cache/sec-policy/selinux-uml-9999
index cc57fac1c958..e3b83bcd1a99 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uml-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=392e6d16002df89d79abdfff6f361050
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
index a8f6619194e6..5e5748af4035 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fd950fde7450286313e9d3ee24e63b7d
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20210203-r1
index 27388dc56d1f..a4c01fd21f8b 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=593c630b402422fb1f24a0f2aa3b9f0b
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-9999 b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
index 85eb865b1d48..fa22ce6e20c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-9999
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=593c630b402422fb1f24a0f2aa3b9f0b
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
index c3ca3a838e10..b3a24cb5e904 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=28cea2d301c2040d2eab21efb113a440
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20210203-r1
index 0ceff20ecb5d..4f6393e1bc7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6d917f908697e9fa1f4b9d24c00fce64
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-9999 b/metadata/md5-cache/sec-policy/selinux-uptime-9999
index d4be08bba913..0bd7923c47eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6d917f908697e9fa1f4b9d24c00fce64
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
index 0b5f9bd8cc09..2db60ad3e048 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=be0857c627f9d575c0ce0a92bd40009d
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20210203-r1
index d3c447d4e82d..3ea903c94813 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=222f893e6c591fc1cd68461a181529ba
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
index 8da2d729f864..72d11591f74a 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=222f893e6c591fc1cd68461a181529ba
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
index d7c351313c25..8c96917870da 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8bda875ab1834ba8dde98d9dc072b500
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20210203-r1
index 336293588562..23a1fed344f8 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dffa484cd0e18f973d62827c843d6c88
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-9999 b/metadata/md5-cache/sec-policy/selinux-uucp-9999
index 8d34095218aa..6af31fe00b4f 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=dffa484cd0e18f973d62827c843d6c88
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
index dc1a1ada03f3..20debb0bbe71 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=87c01aa5238c46ec5fc9066338c1c04e
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20210203-r1
index 4dc1a5fe2f79..15c194f7f3bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8cd1bad069831712a3c643529f765bc5
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-9999 b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
index 7f9bed21731a..db86d1350749 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=8cd1bad069831712a3c643529f765bc5
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
index 9f48c2420169..1d2854eb54e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=60d7c244b385905fdb4662ce5e4d394c
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20210203-r1
index 23392b9ebac8..b87ce39afb53 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e97ccb9fe6d956d51aa8badf11bdcabf
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-9999 b/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
index 593b0408862c..91793f209ed2 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e97ccb9fe6d956d51aa8badf11bdcabf
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
index 149b39034553..8a0468182f62 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e9e974c1906bc198223d4c028f00d270
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20210203-r1
index c5a1dce0bf8b..1f8e01f4a541 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fe7b06d08081aa169ed6855bf6860253
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-9999 b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
index 6bdd12199caa..09bb34f8c2c0 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fe7b06d08081aa169ed6855bf6860253
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
index 98bd4d2d920f..4bff24f115ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5887261f7a2a6ee73fc549ec2fcb69a0
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20210203-r1
index cd8a0c8fc966..2301cf81c7be 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=67393227831b30e978c49f0a183ec3cf
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-9999 b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
index 6151e2440ce7..d83772e3cf91 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=67393227831b30e978c49f0a183ec3cf
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
index 604686b2dd31..d8ab20a1ba4b 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e99ae37d17c7c0d35a696aaf4cc15e39
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20210203-r1
index 54334bbcee50..2792d967c8d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9138a5d66dbe62d176f37a0fb200b219
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-9999 b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
index 314f8022f210..3c35c031b544 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=9138a5d66dbe62d176f37a0fb200b219
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
index af3b0d62afe9..421ccd9c8c3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=073b5df93511fcfc142484fd05ba03bf
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-vde-2.20210203-r1
index 31df839e6b9b..19720d5876cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e8bda685ea28bef5e963a553e9921cf2
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-9999 b/metadata/md5-cache/sec-policy/selinux-vde-9999
index 90c849e3fd70..d9238ed46548 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vde-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=e8bda685ea28bef5e963a553e9921cf2
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
index d9dd464d2128..a58a84d1bec1 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bc9c660453e15176120915e68e62dc1a
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-virt-2.20210203-r1
index 6f41fdb40e59..9bb6a179ed17 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d3b92f2c09ad779f043f3c6eb5be1862
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-9999 b/metadata/md5-cache/sec-policy/selinux-virt-9999
index 93d981365c6a..9d1697489f51 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-virt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=d3b92f2c09ad779f043f3c6eb5be1862
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
index c5b83598e247..81ce8a52aa41 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f9e6b918bd9535543b1e6202280e239d
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20210203-r1
index ec66ae58d191..f07e4abc4489 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5e56ff03dc0305dde07cd5dfce24bc1e
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-9999 b/metadata/md5-cache/sec-policy/selinux-vlock-9999
index 569f8048a2c5..ba6a03755637 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=5e56ff03dc0305dde07cd5dfce24bc1e
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
index 5f5924a25e0f..0e600d5d3b17 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=7504110015610af66376e93333d71b34
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20210203-r1
index 9fcc0732c2d3..89c57272ef77 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=52eab4bd61edf065199d0d03fae02755
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-9999 b/metadata/md5-cache/sec-policy/selinux-vmware-9999
index cdfe7324c1d1..9a9f213723cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=52eab4bd61edf065199d0d03fae02755
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
index 1967f06b384d..920b91bb9588 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=95392d0396f3ceabaf0a9c81663c73eb
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20210203-r1
index 12a952578452..4b86230ab03d 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6a67c68778856e7a4b271e30678d559b
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999 b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
index 9b5dd6a9ac17..9f53e2d0d5d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=6a67c68778856e7a4b271e30678d559b
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
index 9e547a3076e8..2113c7388a73 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=afcd148fef8c2fa800e2e6e6ab0f31a4
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20210203-r1
index 6b6b7d55d345..4d5be03997d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2540be8d83695dcfb8d2d7696a848936
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-9999 b/metadata/md5-cache/sec-policy/selinux-vpn-9999
index 83171472bf6f..c8b95a9a8f1a 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2540be8d83695dcfb8d2d7696a848936
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
index 50bc6fed1412..caed231398be 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=0dc2501b5690dced91f7ab9fbc8a2cfe
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20210203-r1
index 75d7ddf94c12..28d46c33f114 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=68a31bd77efaff55f91906071539e71e
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-9999 b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
index b418feac2558..5eb8a410a5b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=68a31bd77efaff55f91906071539e71e
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
index a6b07313bcd1..3ea7537dc709 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bdce456127a8e02a60714e9135d2f5ad
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20210203-r1
index 5ef14fb3eec8..6cdb1410ae0e 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c52dbcfb744870d3abad659813901cc7
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-9999 b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
index 0b284d777459..89872d8cfbf2 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=c52dbcfb744870d3abad659813901cc7
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
index 366b281872b5..31b97ae9c5ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4ff56036cf99e604e172aee0d3c2893a
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-wine-2.20210203-r1
index fedd39b8ecc6..e2728ff206dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=33d3d690303c3e004ca0e4e585fa4714
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-9999 b/metadata/md5-cache/sec-policy/selinux-wine-9999
index 2bc8fe09bbeb..69c0a87dbde4 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wine-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=33d3d690303c3e004ca0e4e585fa4714
diff --git a/metadata/md5-cache/sec-policy/selinux-wireguard-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-wireguard-2.20210203-r1
index 3ee275db9df9..90fb4f95125a 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireguard-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wireguard-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fb1b164910c63b998aa4b3e055b7e25d
diff --git a/metadata/md5-cache/sec-policy/selinux-wireguard-9999 b/metadata/md5-cache/sec-policy/selinux-wireguard-9999
index d2e1e5d056f3..4ea11c0a80ac 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireguard-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wireguard-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=fb1b164910c63b998aa4b3e055b7e25d
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
index c3fca6ae4fdb..90f95d427f21 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=bed6ffda18e8814ee3c4326c3797eeb1
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20210203-r1
index 05e0d93fedc6..bfec59d39402 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a6b487541fc3b0b3bfdd1f84ef4d940f
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-9999 b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
index 9d4093882203..2f319230275a 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a6b487541fc3b0b3bfdd1f84ef4d940f
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
index 66f97ee7a914..d2c085a6cf5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a26daeb1201af41736fcd20cf0f216d4
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-wm-2.20210203-r1
index 8e028b472e2a..f03c65137d29 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2468157deb2f83cd0143a262a6ab046d
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-9999 b/metadata/md5-cache/sec-policy/selinux-wm-9999
index 60d69eed30bf..256f86fe332b 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=2468157deb2f83cd0143a262a6ab046d
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
index 4d582af1cb0b..4de5a363fdbd 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=4ec1a01de542a9a52d79c32e89defe4e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-xen-2.20210203-r1
index 0d1f29237e0b..dc83c7e6fa7a 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a1b98bf31b37fa81ba421aa1dfd09f4e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-9999 b/metadata/md5-cache/sec-policy/selinux-xen-9999
index 82f62456ff4e..e9f6e1260b55 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xen-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a1b98bf31b37fa81ba421aa1dfd09f4e
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
index 39ad779c51db..1f381b576d9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a10772e121471987049b45b785d57f8f
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20210203-r1
index 2d53f9ff73d9..6fc72c7ed342 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f112a9a4262046e80bcc559e1f025083
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-9999 b/metadata/md5-cache/sec-policy/selinux-xfs-9999
index cb3c750f94c5..1d6f94f361da 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=f112a9a4262046e80bcc559e1f025083
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
index 67a59b8e0c83..d8fb495fd676 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=05d0e32632382564e6b1dd413ee86f78
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
index 176ec5ec23cf..206689e311db 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=32fd1d747c36197ef7ecd958c9264718
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20210203-r1
index 13d8c0e713dd..2bc43d32e283 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1b664db37b6f34824cade24857918a24
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
index c143a67cc146..acdb7f56b515 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1b664db37b6f34824cade24857918a24
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
index 7719aa070b9f..0a2fa74d253f 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=23820c3ed3338ff9b25d28cddae32f94
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20210203-r1
index c125e43bf3e5..217974c8e060 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a05abebef70dcbf0c10a1161746f0eb1
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-9999 b/metadata/md5-cache/sec-policy/selinux-xserver-9999
index 14ab448260f8..42eb69529a1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=a05abebef70dcbf0c10a1161746f0eb1
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
index 09a9b91e883d..646c2f2e5006 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=1bd0fd0e0846b908eed903f288a4407d
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20210203-r1 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20210203-r1
index 4b091cf63406..90a74e41fc16 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20210203-r1
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20210203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20210203-r1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203/refpolicy-2.20210203.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=14c52dbc1249fd95df0b66f861fcccea
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-9999 b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
index 3ddfe72e11a8..4d9a00c352eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	selinux-policy-2	9f1323da52574c94200f5c197206ae60
 _md5_=14c52dbc1249fd95df0b66f861fcccea
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 11a5f99dbff4..151a1c6dcf17 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/bolt-0.9-r2 b/metadata/md5-cache/sys-apps/bolt-0.9-r2
deleted file mode 100644
index d1e87349ee38..000000000000
--- a/metadata/md5-cache/sys-apps/bolt-0.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
-DESCRIPTION=Userspace system daemon to enable security levels for Thunderbolt 3
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/bolt/bolt
-IUSE=doc systemd kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9/bolt-0.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e4ea7096ef9646f37a64629cad58ed1
diff --git a/metadata/md5-cache/sys-apps/bolt-0.9.1 b/metadata/md5-cache/sys-apps/bolt-0.9.1
index b0067cb12e62..861cd521744b 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.9.1
+++ b/metadata/md5-cache/sys-apps/bolt-0.9.1
@@ -5,10 +5,10 @@ DESCRIPTION=Userspace system daemon to enable security levels for Thunderbolt 3
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/bolt/bolt
 IUSE=doc systemd kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9.1/bolt-0.9.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e1d50be433d6073ce0408abe6b4f59a9
+_md5_=4fec23c32290af59643caa39e0a17f4e
diff --git a/metadata/md5-cache/sys-apps/hwloc-2.5.0 b/metadata/md5-cache/sys-apps/hwloc-2.5.0
index d7d8de786d2f..5a832c9d4b09 100644
--- a/metadata/md5-cache/sys-apps/hwloc-2.5.0
+++ b/metadata/md5-cache/sys-apps/hwloc-2.5.0
@@ -5,10 +5,10 @@ DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=7
 HOMEPAGE=https://www.open-mpi.org/projects/hwloc/
 IUSE=cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3: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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) netloc? ( !sys-apps/netloc ) nvml? ( x11-drivers/nvidia-drivers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/15
 SRC_URI=https://www.open-mpi.org/software/hwloc/v2.5/downloads/hwloc-2.5.0.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1264a897f3e4b259acd6b1ac5e5d94c2
+_md5_=f42b772b790fdcb042e80845ba672776
diff --git a/metadata/md5-cache/sys-apps/man2html-1.6g b/metadata/md5-cache/sys-apps/man2html-1.6g
index 51424e9c6953..bee62f353c6d 100644
--- a/metadata/md5-cache/sys-apps/man2html-1.6g
+++ b/metadata/md5-cache/sys-apps/man2html-1.6g
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Standard commands to read man pages
 EAPI=7
 HOMEPAGE=http://primates.ximian.com/~flucifredi/man/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/man
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bb162e576a5c4312ac2950b72a4fd78c
+_md5_=78f5a0629bef64f5d4152cd79d3e8d0a
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index c90fd2a9d8c3..ece53673add2 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/munge-0.5.13-r1 b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
index 38b2686e6ff5..3f24a5f0dcab 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.13-r1
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An authentication service for creating and validating credentials
 EAPI=6
 HOMEPAGE=https://github.com/dun/munge
 IUSE=debug gcrypt static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a46b20b9c22c3556b894440ed0d1573
+_md5_=bea57c99b5c3621ced98ec80dc9f4f0c
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index e71599ada8c5..270dffe9c451 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/fio-3.27 b/metadata/md5-cache/sys-block/fio-3.27
index 7aaee23bdf5f..61ac056ebd8a 100644
--- a/metadata/md5-cache/sys-block/fio-3.27
+++ b/metadata/md5-cache/sys-block/fio-3.27
@@ -5,7 +5,7 @@ DESCRIPTION=Jens Axboe's Flexible IO tester
 EAPI=7
 HOMEPAGE=https://brick.kernel.dk/snaps/
 IUSE=aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( 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-lang/python:3.9 dev-python/pandas[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pandas[python_targets_python3_8(-)] ) ) ) gnuplot? ( sci-visualization/gnuplot )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) gnuplot? ( python ) io-uring? ( aio )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/fio-3.27.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2553b58ed53142e4b33560e70a8e460a
+_md5_=abfa2e8275a7243a0aee7c77ec3cfa39
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index feb9acf03d5d..b10aaaa10066 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/nullmpi-0.7 b/metadata/md5-cache/sys-cluster/nullmpi-0.7
index 9556772c8240..9dee2cd98707 100644
--- a/metadata/md5-cache/sys-cluster/nullmpi-0.7
+++ b/metadata/md5-cache/sys-cluster/nullmpi-0.7
@@ -4,10 +4,10 @@ DESCRIPTION=MPI substitute library
 EAPI=6
 HOMEPAGE=http://wissrech.ins.uni-bonn.de/research/projects/nullmpi/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-1
 RDEPEND=!sys-cluster/openmpi !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mvapich2 !sys-cluster/native-mpi
 SLOT=0
 SRC_URI=http://wissrech.ins.uni-bonn.de/research/projects/nullmpi/nullmpi-0.7.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bea132157e4e3e14ae3b5477e146708e
+_md5_=3b65084e2f34a9c823a949b64948f347
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
index 93d94a60933a..f8d0eb459940 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.5.tar.bz2
 _eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c864b98ad063363e3e236f2cbdfe2ac
+_md5_=be2c39df6c4fea7d38cbea90c84f72d3
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
index 317b6223abdc..79c9e3cddc7e 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
@@ -5,7 +5,7 @@ DESCRIPTION=A Highly Scalable Resource Manager
 EAPI=7
 HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
 IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:= virtual/tmpfiles
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) torque? ( perl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	20268f317853c44164a3065f1e6ff68b	lua-utils	a2553e8a65058f277bf0b2da4be361b0	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd185fc539fe4a2f37767f35a3f0091b
+_md5_=c65f947b51a10aae437968a8c0817892
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
index 532befa6b47a..c0a15d94b42f 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=6
 HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
 IUSE=autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk kernel_linux
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=61242704ab720cb1089fc6b9ed002848
+_md5_=3eb9d1de126b08db4a029d0396fc0bae
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.10.0_rc5 b/metadata/md5-cache/sys-cluster/ucx-1.10.0_rc5
index 66bf011694fa..5ded3897c319 100644
--- a/metadata/md5-cache/sys-cluster/ucx-1.10.0_rc5
+++ b/metadata/md5-cache/sys-cluster/ucx-1.10.0_rc5
@@ -5,10 +5,10 @@ DESCRIPTION=Unified Communication X
 EAPI=7
 HOMEPAGE=https://www.openucx.org
 IUSE=+numa +openmp
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 -riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-libs/binutils-libs:= numa? ( sys-process/numactl )
 SLOT=0
 SRC_URI=https://github.com/openucx/ucx/archive/v1.10.0-rc5.tar.gz -> ucx-1.10.0_rc5.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f8bbc61af62763f6c5451944fcf9e417
+_md5_=d277c3cc55ce4ddf0bb5cf5c11dbe264
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index b4ebccf7be16..555840723509 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.1_rc4 b/metadata/md5-cache/sys-devel/clang-12.0.1_rc4
new file mode 100644
index 000000000000..aeba191398cd
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-12.0.1_rc4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) 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] ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-12.0.1_rc4:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) 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] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx default-lld doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE test doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-12.0.1_rc4 default-compiler-rt? ( =sys-libs/compiler-rt-12.0.1* llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) default-libcxx? ( >=sys-libs/libcxx-12.0.1_rc4 ) default-lld? ( sys-devel/lld )
+RDEPEND=~sys-devel/llvm-12.0.1_rc4:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) 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] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1_rc4:12[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=12
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5dfea45f00363c81f97e9fe80f3762e7
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.1_rc4 b/metadata/md5-cache/sys-devel/clang-common-12.0.1_rc4
new file mode 100644
index 000000000000..8da4fdbc2952
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.1_rc4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:*
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-12.0.1_rc4 b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1_rc4
new file mode 100644
index 000000000000..368578c00dee
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1_rc4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=7
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-12.0.1_rc4:12.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-12.0.1_rc4:12.0.1 ) ) libcxx? ( >=sys-libs/libcxx-12.0.1_rc4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-12.0.1_rc4[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=sanitize? ( compiler-rt )
+SLOT=12.0.1
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/distcc-3.4 b/metadata/md5-cache/sys-devel/distcc-3.4
index fde6ba9b0f11..8f72bd5bbaf0 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.4
+++ b/metadata/md5-cache/sys-devel/distcc-3.4
@@ -5,11 +5,11 @@ DESCRIPTION=Distribute compilation of C code across several machines on a networ
 EAPI=7
 HOMEPAGE=https://github.com/distcc/distcc
 IUSE=gssapi gtk hardened ipv6 selinux xinetd zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+
 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] ) dev-libs/popt gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:3 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) acct-user/distcc dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/distcc/distcc/releases/download/v3.4/distcc-3.4.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2c5039b7c2b67221433c9810e8400ca6
+_md5_=59640c2417d1444686bb21f90fcef666
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
new file mode 100644
index 000000000000..2360d85f258e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d650856d4fd39f9c2e871536cb2027cb
diff --git a/metadata/md5-cache/sys-devel/gcc-11.1.0-r2 b/metadata/md5-cache/sys-devel/gcc-11.1.0-r2
new file mode 100644
index 000000000000..b1e5c18fed90
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.1.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=mirror://gnu/gcc/gcc-11.1.0/gcc-11.1.0.tar.xz mirror://gentoo/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=08939da2366345553797078ef4a0324e
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r4 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
new file mode 100644
index 000000000000..ba7f69a0f7ec
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=6.5.0
+SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-6.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f8f43a350a54709604645df150d2db6b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
new file mode 100644
index 000000000000..5a837a1f5e1b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=7.5.0
+SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-4.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f27156fb5bdc447364253107591e28f1
diff --git a/metadata/md5-cache/sys-devel/gcc-8.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-8.4.0-r2
index dff1496d6486..2d0aab91b80e 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.4.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-8.4.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=8.4.0
 SRC_URI=mirror://gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz mirror://gentoo/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88f4f286f7f9dc3eee3232bb47f60fcf
+_md5_=50cd18b0e3cda413d652ddd86a7d853f
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0 b/metadata/md5-cache/sys-devel/gcc-8.5.0
index 7a003de70143..f493a39d931a 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0
@@ -5,7 +5,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=8.5.0
 SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz mirror://gentoo/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.5.0-patches-1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0dd04a33798fd4ec0cc37613f55fc6c1
+_md5_=9c0211a37a0e4a4a98306b4d13568b08
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
new file mode 100644
index 000000000000..8b1f64f38a49
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=8.5.0
+SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz mirror://gentoo/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.5.0-patches-2.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ffcf8176b113f48ac087a75c088abb9d
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.1_rc4 b/metadata/md5-cache/sys-devel/lld-12.0.1_rc4
new file mode 100644
index 000000000000..e9825dc66b78
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-12.0.1_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 ~dev-python/lit-12.0.1_rc4[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-12.0.1_rc4[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-12.0.1_rc4 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-12.0.1_rc4
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ebe0ebd4ec2ec41ca3b8916a12290331
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.1_rc4 b/metadata/md5-cache/sys-devel/llvm-12.0.1_rc4
new file mode 100644
index 000000000000..f29b0a525865
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.1_rc4
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-12.0.1.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib: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(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-12 )
+RDEPEND=sys-libs/zlib: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(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fb11419bf87331a07642b9313f5f7b42
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.1_rc4 b/metadata/md5-cache/sys-devel/llvm-common-12.0.1_rc4
new file mode 100644
index 000000000000..976c0eb5e311
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.1_rc4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 2b134a65cb20..b110a86fa1bc 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/cryptsetup-2.3.6 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
index d887b9cb84bb..0d9680fd4d8d 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
@@ -5,11 +5,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e23360fbb4d9d7ceab19bc13262b3a20
+_md5_=5b964a448e04441abc3f8f125efadf10
diff --git a/metadata/md5-cache/sys-fs/fuse-3.10.3 b/metadata/md5-cache/sys-fs/fuse-3.10.3
index 8d1c1f876db1..351edc7f047d 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.10.3
+++ b/metadata/md5-cache/sys-fs/fuse-3.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=7
 HOMEPAGE=https://github.com/libfuse/libfuse
 IUSE=+suid test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.10.3/fuse-3.10.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=75dfcd34402bb54c73ec97f891d4fe77
+_md5_=365c40c88cd2cf6c80bdbdb01aff5414
diff --git a/metadata/md5-cache/sys-fs/growpart-0.0.32 b/metadata/md5-cache/sys-fs/growpart-0.0.32
index 30a30d31e86f..1365beaf8604 100644
--- a/metadata/md5-cache/sys-fs/growpart-0.0.32
+++ b/metadata/md5-cache/sys-fs/growpart-0.0.32
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A script that can grow your rootfs on first boot
 EAPI=6
 HOMEPAGE=http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=sys-apps/gptfdisk
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/growpart/growpart-0.0.32.gz
-_md5_=c8eaf458dae5965fc621c1f9c34119cd
+_md5_=643733ec8956504e86536e4e7e6b44cb
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index e7b14061d975..06daa172171b 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/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index c39d232daf51..9d6898cc6246 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -1,14 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst prepare unpack
+DEFINED_PHASES=compile install postinst prepare setup unpack
 DEPEND=app-text/asciidoc
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-IUSE=ibm +firmware
+IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
+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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
-SRC_URI=https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.11.tar.xz https://www.busybox.net/downloads/busybox-1.33.0.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.5.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20201207.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-28.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.2.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.41.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.11/strace-5.11.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.11.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.9.tar.gz -> zstd-1.4.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7dbee8372d90060ff6fe8ba911f873c
+SRC_URI=https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.76.0/source/boost_1_76_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.12.1.tar.xz https://www.busybox.net/downloads/busybox-1.33.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.3.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.42.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.23.tar.gz -> libxcrypt-4.4.23.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.12.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e40cade218aaf87134dcd081f4854fa2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0-r1
new file mode 100644
index 000000000000..a3cd1f037ee9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.13 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.0-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-2.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=122011d8970827dbee59460c66feb2b6
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.13 b/metadata/md5-cache/sys-kernel/linux-headers-5.13
new file mode 100644
index 000000000000..0151edfcec56
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.13
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/xz-utils dev-lang/perl
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux system headers
+EAPI=7
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
+IUSE=headers-only
+LICENSE=GPL-2
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~soap/distfiles/gentoo-headers-5.13-1.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2aa44a1b659779636f295d3bf01cdbc
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 4be2a929a4fd..032f6e99ee23 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/compiler-rt-12.0.1_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1_rc4
new file mode 100644
index 000000000000..ddc483731690
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1_rc4
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-)] ) ) =sys-devel/clang-12.0.1*:12 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=12.0.1
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d3e3e708ed6ff1177fd8ac2d876e34b6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
index 18f0f6d3e258..907898baaa71 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-2.tar.xz
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-4.tar.xz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fbbe4ecfb92873410ea90a022283e3cb
+_md5_=e3fa140400891876cff0f11994c246b8
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
index 939efabb55d2..d1d5d1574707 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=11.1.0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-2.tar.xz
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-3.tar.xz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=39f05caaa5e3add57dc608372e32be28
+_md5_=df52bb64510a8c85d18909d3bda211e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1_rc4
new file mode 100644
index 000000000000..1db4f7f568ba
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1_rc4
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.9 >=dev-python/lit-5[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-)] ) ) =sys-devel/clang-12.0.1*:12 sys-libs/compiler-rt:12.0.1 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test elibc_glibc +libfuzzer +memprof +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
+SLOT=12.0.1
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=21e20dbcb09e9b8909d2393482be937c
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.1_rc4 b/metadata/md5-cache/sys-libs/libcxx-12.0.1_rc4
new file mode 100644
index 000000000000..d461131724ff
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.1_rc4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-12.0.1_rc4[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=7
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind 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
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-12.0.1_rc4[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0f7f8ab4c56665eb0e53b305c16c058c
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.1_rc4 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1_rc4
new file mode 100644
index 000000000000..f8de70cbfadb
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b82c9d0543e5b07313391c22198ea376
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.1_rc4 b/metadata/md5-cache/sys-libs/libomp-12.0.1_rc4
new file mode 100644
index 000000000000..9d319622e0d1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.1_rc4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) >=sys-devel/clang-6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc: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(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=7
+HOMEPAGE=https://openmp.llvm.org
+IUSE=cuda hwloc kernel_linux offload ompt 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 kernel_linux
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5f70e2f48f5006453727a22f9510b64f
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1_rc4 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1_rc4
new file mode 100644
index 000000000000..fae266d914fc
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=7
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9415ab8fcd598fb46b4d3f6fdcd4ac71
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index c0cc2de4f3c0..3afc00e51217 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.14 b/metadata/md5-cache/sys-process/numactl-2.0.14
index b4a5e4614d57..fe13b7dd8e1d 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.14
+++ b/metadata/md5-cache/sys-process/numactl-2.0.14
@@ -4,9 +4,9 @@ DESCRIPTION=Utilities and libraries for NUMA systems
 EAPI=7
 HOMEPAGE=https://github.com/numactl/numactl
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 -arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 -arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.14/numactl-2.0.14.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f284271bfc6f9681ef9121726e2be12f
+_md5_=5eb457c617ae2a11a3bad398fe349e35
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index ae3735a95221..7254d54b4b32 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/mpi-2.0-r5 b/metadata/md5-cache/virtual/mpi-2.0-r5
index d702bcb5754e..5e65e74f658c 100644
--- a/metadata/md5-cache/virtual/mpi-2.0-r5
+++ b/metadata/md5-cache/virtual/mpi-2.0-r5
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Passing Interface (MPI) v2.0 implementation
 EAPI=7
 IUSE=cxx fortran romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-cluster/openmpi-1.10.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads(+)?] >=sys-cluster/mpich-3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/mpich2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/nullmpi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx(-)?,fortran(-)?,romio(-)?,threads(-)?] sys-cluster/native-mpi )
 SLOT=0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1ecf3ad75e99d1ff44fd4db43bf05c1
+_md5_=b6381728eb198bbd3a387ec474e18176
diff --git a/metadata/md5-cache/virtual/mta-1-r2 b/metadata/md5-cache/virtual/mta-1-r2
index 65ab4b13ff57..0315b59f67cb 100644
--- a/metadata/md5-cache/virtual/mta-1-r2
+++ b/metadata/md5-cache/virtual/mta-1-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Transfer Agents
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( mail-mta/nullmailer mail-mta/msmtp[mta] mail-mta/ssmtp[mta] mail-mta/courier mail-mta/esmtp mail-mta/exim mail-mta/netqmail mail-mta/notqmail mail-mta/postfix mail-mta/sendmail mail-mta/opensmtpd[mta] )
 SLOT=0
-_md5_=b041fd25470de1ba37e67c1182ef654c
+_md5_=c218767d64780cdeade2797fc4db4e8e
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 7484add89a16..7fd0de1563af 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/icingaweb2-module-director-1.8.0 b/metadata/md5-cache/www-apps/icingaweb2-module-director-1.8.0
index e3991f6ada4e..17000be7095a 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-module-director-1.8.0
+++ b/metadata/md5-cache/www-apps/icingaweb2-module-director-1.8.0
@@ -3,9 +3,9 @@ DEPEND=>=net-analyzer/icinga2-2.4.3 >=www-apps/icingaweb2-2.2.0 || ( dev-lang/ph
 DESCRIPTION=Icinga Web 2 plugin for configuration
 EAPI=6
 HOMEPAGE=https://dev.icinga.org/projects/icingaweb2-module-director/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.4.3 >=www-apps/icingaweb2-2.2.0 || ( dev-lang/php:5.6[curl] dev-lang/php:7.1[curl] dev-lang/php:7.2[curl] dev-lang/php:7.3[curl] )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2-module-director/tar.gz/v1.8.0 -> icingaweb2-module-director-1.8.0.tar.gz
-_md5_=f95e7cf7a0554da835f4b8dcb7a2a93e
+_md5_=4c2dc19b5a5fd649cc6aef1c46619699
diff --git a/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.1.0 b/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.1.0
index b6ba235fda94..7e477a3d54cc 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.1.0
+++ b/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.1.0
@@ -3,9 +3,9 @@ DEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
 DESCRIPTION=Icinga Web 2 plugin for Graphite
 EAPI=7
 HOMEPAGE=https://www.icinga.com/docs/graphite/latest/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
 SLOT=0
 SRC_URI=https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.1.0.tar.gz -> icingaweb2-module-graphite-1.1.0.tar.gz
-_md5_=71ad75b2ddf4c91b216ff91cd416e23e
+_md5_=33df3be7c584cf60b901ad6606c2c701
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d8a1db1d008a..2a09d4c4197c 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/links-2.23 b/metadata/md5-cache/www-client/links-2.23
index 31ac5e043392..23b44bf8fab2 100644
--- a/metadata/md5-cache/www-client/links-2.23
+++ b/metadata/md5-cache/www-client/links-2.23
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and lightweight web browser running in both graphics and text
 EAPI=6
 HOMEPAGE=http://links.twibright.com/
 IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.23.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=14e6c3bcc7db2d2eb4d2a8f1a7ce35a9
+_md5_=4a76df0396194cf6b60045637be52988
diff --git a/metadata/md5-cache/www-client/opera-developer-78.0.4079.0 b/metadata/md5-cache/www-client/opera-developer-79.0.4105.0
similarity index 76%
rename from metadata/md5-cache/www-client/opera-developer-78.0.4079.0
rename to metadata/md5-cache/www-client/opera-developer-79.0.4105.0
index 48167a3451cc..3a60420088c2 100644
--- a/metadata/md5-cache/www-client/opera-developer-78.0.4079.0
+++ b/metadata/md5-cache/www-client/opera-developer-79.0.4105.0
@@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/78.0.4079.0/linux/opera-developer_78.0.4079.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/78.0.4079.0/linux/opera-developer_78.0.4079.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/78.0.4079.0/linux/opera-developer_78.0.4079.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/78.0.4079.0/linux/opera-developer_78.0.4079.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4484.7.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
 _eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8a7f8d825ff7892b939c39ba7796168
+_md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index ec8a4eb2ebe0..eb7ca19ebef5 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.8 b/metadata/md5-cache/www-servers/tomcat-10.0.8
new file mode 100644
index 000000000000..ee889b9d4a9f
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.8:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.8:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=10
+SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.8/src/apache-tomcat-10.0.8-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
+_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=27d1ae4b63ecc376abe0a67070a719d4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.50 b/metadata/md5-cache/www-servers/tomcat-9.0.50
new file mode 100644
index 000000000000..01b122efc63a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.50
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.50:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.50:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.50/src/apache-tomcat-9.0.50-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
+_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7027599b7c59f2650e4b048f450a3abe
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 887fe7f5089a..d5d92942f66f 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2 b/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
index df70ac9fdc2c..1c1d8050ec19 100644
--- a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
+++ b/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
@@ -3,9 +3,9 @@ DEPEND=dev-util/patchutils
 DESCRIPTION=Run a command in a virtual X server environment
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/xvfb
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_1.20.8-2.diff.gz
-_md5_=c75c42653b52258caf84b78afadc5488
+_md5_=a30e5a6048d137ec0454d2723857d1ee
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 9cdd6f23b287..88f56b20d438 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3
index e1b930297ebd..55504bc8fbcc 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3
@@ -5,11 +5,11 @@ DESCRIPTION=Panel for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6b708f777c467e1709b4e85c7ae5d61a
+_md5_=ec9628343d7cfa49b59c8da4489fa23f
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.16.2 b/metadata/md5-cache/xfce-base/xfce4-settings-4.16.2
index e9787856193b..1e379d0e163f 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.16.2
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.16.2
@@ -5,11 +5,11 @@ DESCRIPTION=Configuration system for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 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] ) >=dev-libs/glib-2.50 media-libs/fontconfig >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.16/xfce4-settings-4.16.2.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c5a1f32ecf05fbd3c906e51cebcffb7
+_md5_=5cf68c4c40eae11004305df18a4dc7c9
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 0c2ed5b5f69d..a7d2c908118e 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.2 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.2
index 1c021d9397d4..f0018465c709 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=A clipboard manager plug-in for the Xfce panel
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
 IUSE=qrcode
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.22.29:3= x11-libs/libXtst:= >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:= qrcode? ( >=media-gfx/qrencode-3.3.0:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.6/xfce4-clipman-plugin-1.6.2.tar.bz2
 _eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2cd585f3a01285218f52fb85af64f99b
+_md5_=22e2e533c96f4c830b8c27e5253c1990
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.9 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.9
index 308804db0641..a146e54a5bfd 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.9
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.9
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.
 DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= >=x11-libs/pango-1.44:= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.9.tar.bz2
 _eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=25ccbf9474e9813d79055043ff1ee6e4
+_md5_=547e25426cf1197539b9a450fd29865d
diff --git a/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.ru.txt b/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.ru.txt
new file mode 100644
index 000000000000..d52db1143a5a
--- /dev/null
+++ b/metadata/news/2021-06-30-libxcrypt-migration/2021-06-30-libxcrypt-migration.ru.txt
@@ -0,0 +1,47 @@
+Title: Миграция в ~arch с glibc[crypt] на libxcrypt
+Author: Andreas K. Hüttel <dilfridge@gentoo.org>
+Author: Sam James <sam@gentoo.org>
+Translator: Alexey Sokolov <alexey+gentoo@asokolov.org>
+Posted: 2021-06-30
+Revision: 1
+News-Item-Format: 2.0
+
+Реализация библиотеки libcrypt.so в glibc давно устарела и скоро
+будет удалена.
+
+Прочие дистрибутивы годы назад уже переключились на внешнюю
+реализацию под названием libxcrypt. Мы решили последовать их примеру
+и тоже переключиться на libxcrypt. Вначале изменения затронут системы
+на ~arch.
+
+Это будет обычное обновление, и, скорее всего, вам не нужно будет
+предпринимать никаких действий, и проблем возникнуть не должно.
+
+Однако, мы рекомендуем сперва *полностью* обновить систему.
+Это стандартная рекомендация, но в этом конкретном случае
+более простой граф зависимостей поможет portage вычислить
+порядок обновлений.
+
+Так что, чтобы упростить процесс обновления, пожалуйста,
+обновите систему сейчас, до начала самой миграции.
+
+Для пользователей ~arch изменение произойдёт 14 июля 2021,
+пользователи стабильной ветки перейдут на libxcrypt позже.
+
+Если по какой-либо причине вы *не* хотите пока переходить
+на libxcrypt (всего лишь отлагая неизбежное), выполните
+следующие действия:
+* размаскируйте и включите USE-флаг crypt пакета sys-libs/glibc
+* замаскируйте USE-флаг system пакета sys-libs/libxcrypt
+* замаскируйте >=virtual/libcrypt-2
+
+Если вы хотите перейти на libxcrypt уже, точная процедура
+описана в wiki (см. ниже), но суть такая:
+* принудительно выключите USE-флаг crypt пакета sys-libs/glibc
+* размаскируйте USE-флаги system и, если требуется, split-usr
+  пакета sys-libs/libxcrypt
+* размаскируйте ~virtual/libcrypt-2
+
+Дополнительные сведения можно найти здесь:
+* https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
+* https://bugs.gentoo.org/699422
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 00b7cfd9206a..3ca366be0fa1 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2616a02a7074..e132c4cc4fb4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Jul 2021 13:09:07 +0000
+Tue, 06 Jul 2021 07:39:08 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index fbaf21ca7831..3285577f5d5a 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-48149ddf9fcd870bb6ac09a5cd8ded10718f9024 1625122253 2021-07-01T06:50:53+00:00
+3bd3959aa328c89f1ef959bfc342acef117c28a4 1625528803 2021-07-05T23:46:43+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 466dd934a5ed..6afa043a88b7 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1052,19 +1052,14 @@
     </member>
   </project>
   <project>
-    <email>gsoc@gentoo.org</email>
+    <email>soc@gentoo.org</email>
     <name>Google Summer of Code</name>
     <url>https://wiki.gentoo.org/wiki/Project:GSoC</url>
     <description>The central project to unite efforts for Google Summer of Code participation</description>
     <member>
-      <email>alicef@gentoo.org</email>
-      <name>Alice Ferrazzi</name>
-      <role>admin</role>
-    </member>
-    <member>
-      <email>lu_zero@gentoo.org</email>
-      <name>Luca Barbato</name>
-      <role>mentor</role>
+      <email>mattst88@gentoo.org</email>
+      <name>Matt Turner</name>
+      <role>2021 Mentor</role>
     </member>
     <member>
       <email>zlogene@gentoo.org</email>
@@ -2371,6 +2366,10 @@
       <email>gyakovlev@gentoo.org</email>
       <name>Georgy Yakovlev</name>
     </member>
+    <member>
+      <email>ionen@gentoo.org</email>
+      <name>Ionen Wolkens</name>
+    </member>
     <member>
       <email>jstein@gentoo.org</email>
       <name>Jonas Stein</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 0cfb990ee9ee..18359173fc21 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jul  5 01:09:07 PM UTC 2021
+Tue Jul  6 07:39:07 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4f32135651e8..e414cf4c2693 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Jul 2021 13:30:01 +0000
+Tue, 06 Jul 2021 08:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 68c24ead1714..f10561a25709 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-020a3783272ae302333d167a3ce37dc4bdfcffec 1625487624 2021-07-05T12:20:24+00:00
+0b724b2a598ec08f5f29f8aebda6ffcd5571421f 1625556538 2021-07-06T07:28:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b6208f04def9..acb8d7ce63a7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1625490301 Mon 05 Jul 2021 01:05:01 PM UTC
+1625556901 Tue 06 Jul 2021 07:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2616a02a7074..97a12697abc3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Jul 2021 13:09:07 +0000
+Tue, 06 Jul 2021 07:39:07 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index d8c32f974fd9..c39b58c3dfd9 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
index a02a5ad1b864..7e4e261c8daf 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 
 SLOT="0"
 LICENSE="GPL-2"
-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="+fax fidonet split-usr"
 
 PATCHES=(
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 731a2938fcda..ba69cf28326a 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index a779559db91a..8d7eda977928 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1 @@
-DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
 DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25 SHA512 0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
deleted file mode 100644
index 508be107795e..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,7 +11,7 @@
- SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
- SNMPCONF = /etc/snmp/snmpd.conf
- SNMPLINE = dlmod netflow $(SNMPTGSO)
--CC = gcc
-+CC ?= gcc
- 
- # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
- # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
-@@ -22,31 +22,31 @@
- 
- ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat_def.h compat.h Makefile
- 	@echo Compiling for kernel $(KVERSION)
--	make -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
- 	@touch $@
- compat_def.h: gen_compat_def
- 	./gen_compat_def > $@
- sparse: | version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
- 	@rm -f ipt_NETFLOW.ko ipt_NETFLOW.o
- 	@echo Compiling for kernel $(KVERSION)
--	make -C $(KDIR) M=$(CURDIR) modules C=1
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
- 	@touch ipt_NETFLOW.ko
- coverity:
- 	coverity-submit -v
- 
- minstall: | ipt_NETFLOW.ko
- 	@echo " *"
--	make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
- 	$(DEPMOD)
- mclean:
--	make -C $(KDIR) M=$(CURDIR) clean
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) clean
- lclean:
- 	-rm -f *.so *_sh.o
- clean: mclean lclean
- 	-rm -f *.so *.o modules.order version.h compat_def.h
- 
- snmp_NETFLOW.so: snmp_NETFLOW.c
--	$(CC) -fPIC -shared -o $@ $< -lnetsnmp
-+	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
- 
- sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
- 	@echo " *"
-@@ -66,10 +66,10 @@
- 	fi
- 
- %_sh.o: libipt_NETFLOW.c
--	$(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
-+	$(CC) $(CFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
- 
- %.so: %_sh.o
--	$(CC) -shared -o $@ $<
-+	$(CC) $(LDFLAGS) -shared -o $@ $<
- 
- version.h: ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
- 	@./version.sh --define > version.h
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
deleted file mode 100644
index 49721e547fd7..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 1153f73f038205dc17303e6e6c455bbbb56191f7
-Author: ABC <abc@openwall.com>
-Date:   Wed Oct 14 15:35:57 2020 +0300
-
-    gen_compat_def: Check for vlan_dev_priv instead of version if
-
-diff --git a/gen_compat_def b/gen_compat_def
-index c0f20f6..3965e94 100755
---- a/gen_compat_def
-+++ b/gen_compat_def
-@@ -85,6 +85,8 @@ kbuild_test_struct proc_ops linux/proc_fs.h
- kbuild_test_struct proc_ops linux/proc_fs.h
- # No since v5.1, but present in CentOS-8's 4.18.0-227
- kbuild_test_symbol synchronize_sched linux/rcupdate.h
-+# Stumbled on 5.9
-+kbuild_test_struct vlan_dev_priv linux/if_vlan.h
- 
- echo "// End of compat_def.h"
- 
-diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
-index 01055df..6f95166 100644
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -4874,7 +4874,7 @@ static void parse_l2_header(const struct sk_buff *skb, struct ipt_netflow_tuple
- 		tuple->tag[tag_num++] = htons(vlan_tx_tag_get(skb));
- 	else if (skb->dev && is_vlan_dev(skb->dev)) {
- 		struct net_device *vlan_dev = skb->dev;
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
-+# ifdef HAVE_VLAN_DEV_PRIV
- 		struct vlan_dev_priv *vlan = vlan_dev_priv(vlan_dev);
- 
- 		/* `if` condition is `#if`ed intentionally, and this is
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch
new file mode 100644
index 000000000000..21d647190709
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch
@@ -0,0 +1,60 @@
+commit 352cdb28eecbb57de3509b18dfc37dcce0455c01
+Author: ABC <abc@openwall.com>
+Date:   Tue Jun 22 19:07:02 2021 +0300
+
+    Fix compile for stable kernels by not using 'ref_module'
+    
+    `ref_module' unexport in 7ef5264de7732 ("modules: mark ref_module
+    static") is back-ported into stable kernels making old `#if
+    LINUX_VERSION_CODE' checks irrelevant or too complicated to update.
+    
+    Do not use `ref_module' API at all since `try_module_get' is ancient
+    enough to use always.
+    
+    Reported-by: https://github.com/xtaran
+    Fixes: https://github.com/aabc/ipt-netflow/issues/177
+
+diff --git a/compat.h b/compat.h
+index 99edf91..30f1d8f 100644
+--- a/compat.h
++++ b/compat.h
+@@ -170,10 +170,6 @@ static int __ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cm
+ # define CHECK_OK	0
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+-# define use_module	ref_module
+-#endif
+-
+ #ifndef NF_IP_LOCAL_IN /* 2.6.25 */
+ # define NF_IP_PRE_ROUTING	NF_INET_PRE_ROUTING
+ # define NF_IP_LOCAL_IN		NF_INET_LOCAL_IN
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index d3d3901..c4c049d 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -5494,12 +5494,8 @@ static void register_ct_events(void)
+ 	}
+ 	/* Reference netlink module to prevent it's unsafe unload before us. */
+ 	if (!netlink_m && (netlink_m = find_module(NETLINK_M))) {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0)
+-		use_module(THIS_MODULE, netlink_m);
+-#else
+ 		if (!try_module_get(netlink_m))
+ 			netlink_m = NULL;
+-#endif
+ 	}
+ 
+ 	/* Register ct events callback. */
+@@ -5527,10 +5523,9 @@ static void unregister_ct_events(void)
+ #else /* < v3.2 */
+ 	unset_notifier_cb();
+ #endif /* v3.2 */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
+ 	module_put(netlink_m);
+ 	netlink_m = NULL;
+-#endif
++
+ 	rcu_assign_pointer(saved_event_cb, NULL);
+ #else /* < v2.6.31 */
+ 	nf_conntrack_unregister_notifier(&ctnl_notifier);
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
deleted file mode 100644
index bf18a5d00831..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="
-	https://sourceforge.net/projects/ipt-netflow
-	https://github.com/aabc/ipt-netflow
-"
-SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.5-gentoo.patch"
-	"${FILESDIR}/${P}-vlan_dev_priv.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-	if use natevents; then
-		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
-		if kernel_is lt 5 2; then
-			CONFIG_CHECK+=" NF_NAT_NEEDED"
-		else
-			CONFIG_CHECK+=" NF_NAT"
-		fi
-	fi
-
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-}
-
-do_conf() {
-	tc-export CC
-	echo ./configure $*
-	./configure $* ${EXTRA_ECONF} || die 'configure failed'
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# this configure script is not based on autotools
-	# ipt-src need to be defined, see bug #455984
-	do_conf \
-		--disable-dkms \
-		--enable-aggregation \
-		--enable-direction \
-		--enable-macaddress \
-		--enable-vlan \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs') \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-
-	exeinto "${IPT_LIB}"
-	doexe libip{,6}t_NETFLOW.so
-
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
index 97fce443ce9b..35009fb8ac17 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug natevents snmp"
 
@@ -31,6 +31,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-2.6-gentoo.patch"
+	"${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
 )
 
 pkg_setup() {
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 5affae01758b..63f485679dab 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 5dd89b2d2fe4..ba57a650b5d9 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_5.4.1_amd64.deb 112108696 BLAKE2B 5da2692db14f8a67affdc92a3a8515680855a7d81b9341629772ac826cd187b67e13fcbb461e2d51d71c3920ab09c1c4e119c46936d1bf47a09ba4b3c53bdcd1 SHA512 6b076554d0841c60b803b57055fdcc1c1b75a17e5e0f1068d65b6716f17153fa03fe514fc46c84f41430a3a430c3b0beafc2b7d6166432c5f0b1a86cbc7081d0
+DIST signal-desktop_5.7.1_amd64.deb 111629162 BLAKE2B 59166fbe11a92d15155af01f64dac541485dfe57e62925106495eb5111030943696b5d63958658ccb9f3f0c0acffd25e08f441f64748da9314962c0b802979b1 SHA512 be5f5df7579ef1641e96afe7315e5b687ad9cd622df0d601f351f218f7b4b0413499f925b2f349402027ef95ef67b116ef183ce5b8bee6cd730bbb04f947684b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.4.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.7.1.ebuild
similarity index 100%
rename from net-im/signal-desktop-bin/signal-desktop-bin-5.4.1.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-5.7.1.ebuild
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 6ab5d43b9b30..4dd31aff5b1d 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 4341041c7a55..efa92b834ca1 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,2 +1,3 @@
 DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38
 DIST polari-3.38.1.tar.xz 1050280 BLAKE2B 7c1e640a62003bda2217d914f9f19d6eea3994f780785334fd681c792653aa3ef1b4e3e4bc05d7bb15a614cc70e317f8e8a55445fe6e03c249f66b6b3e97af3d SHA512 196fd58324e1ee24eb58efcf9e11b9bec1cfd11781cba5d09b34344b7d3715f9bc215c7a3ec3b021ac5e1d2575a8200d8ab896b201488bf7da2acb10beb04262
+DIST polari-40.0.tar.xz 1051416 BLAKE2B ea6aea087ff3ba74e2cf16e848c228c0984eb7e5b7cc16579bbe8ceeb3655babb5dfbf3adbe245b66b590999c5b7e0077630b659d0db00e2da6ce0ac8b0281da SHA512 267eb904286f33e6ac510357de072285889d1c72ca832eb6a8520a20b1c2487708eaa0187d4c91b46b3b8019866f37a9ac036a71dee9cd9c9ad83443df0f146c
diff --git a/net-irc/polari/polari-40.0.ebuild b/net-irc/polari/polari-40.0.ebuild
new file mode 100644
index 000000000000..d7d2fbaf9dc4
--- /dev/null
+++ b/net-irc/polari/polari-40.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="An IRC client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.21.6:3[introspection]
+	net-libs/telepathy-glib[introspection]
+	>=dev-libs/gobject-introspection-1.50:=
+	>=dev-libs/gjs-1.67.2
+
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=app-text/gspell-1.4.0[introspection]
+	x11-libs/pango[introspection]
+	app-crypt/libsecret[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-im/telepathy-logger[introspection]
+"
+RDEPEND="${DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		dev-lang/spidermonkey:78
+		dev-libs/json-glib
+	)
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7cc9018dc326..84c44a978a34 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
index d6f766f1d735..8246a09277cf 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.2-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.courier-mta.org/authlib/"
 
 LICENSE="GPL-3"
 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="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
diff --git a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
index 6948fe87918a..b8afe562a901 100644
--- a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 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=""
 
 src_configure() {
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 0b6c6a21ed12..7cbe26e3c20f 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
index ade4c58496a1..5a63a30bd282 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 362a102a8c48..fe3d500f7536 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1 +1,2 @@
 DIST NetworkManager-1.30.4.tar.xz 5303420 BLAKE2B c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde SHA512 ca42907d0c0fc6a981d94798a5e264dd58c7d11576a8dd52c8ef6799334af46848091d872e9cec553714766c51457cbe12c5c2017eaac63abce968823b047624
+DIST NetworkManager-1.32.2.tar.xz 5242372 BLAKE2B d19dbbb86cafd29023e0bd1b3a1ce69580d769d77a993b5e0db6cc526de7b1cce573e74c96483bf88c3a45f3ac7d4831a27d1efb1d8414cc8dd6e5671bdbf4f3 SHA512 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index bad2d1a41b75..70f8a3206ee3 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -6,30 +6,48 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
-			<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
-		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
-			getting ip</flag>
-		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
-		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
-		<flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of
-			<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag>
-		<flag name="modemmanager">Enable support for mobile broadband devices
-			using <pkg>net-misc/modemmanager</pkg></flag>
+		<flag name="connection-sharing">
+			Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>)
+		</flag>
+		<flag name="dhclient">
+			Use dhclient from <pkg>net-misc/dhcp</pkg> for getting an IP via DHCP
+		</flag>
+		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting an IP</flag>
+		<flag name="elogind">
+			Use <pkg>sys-auth/elogind</pkg> for session tracking
+		</flag>
+		<flag name="iptables">
+			Use <pkg>net-firewall/iptables</pkg> for connection sharing
+		</flag>
+		<flag name="iwd">
+			Use <pkg>net-wireless/iwd</pkg> instead of
+			<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default
+		</flag>
+		<flag name="modemmanager">
+			Enable support for mobile broadband devices using
+			<pkg>net-misc/modemmanager</pkg>
+		</flag>
+		<flag name="nftables">
+			Use <pkg>net-firewall/nftables</pkg> for connection sharing
+		</flag>
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
 		<flag name="ovs">Enable OpenVSwitch support</flag>
-		<flag name="ppp">Enable support for mobile broadband and PPPoE
-			connections using <pkg>net-dialup/ppp</pkg></flag>
-		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
-			DNS information in /etc/resolv.conf. Generally, a symlink to
-			/run/NetworkManager/resolv.conf is simpler. On systems running
-			systemd-resolved, disable this flag and create a symlink to
-			/run/systemd/resolve/stub-resolv.conf.</flag>
+		<flag name="ppp">
+			Enable support for mobile broadband and PPPoE connections using
+			<pkg>net-dialup/ppp</pkg>
+		</flag>
+		<flag name="resolvconf">
+			Use <pkg>net-dns/openresolv</pkg> for managing DNS information in
+			/etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf
+			is simpler. On systems running systemd-resolved, disable this flag and
+			create a symlink to /run/systemd/resolve/stub-resolv.conf.
+		</flag>
 		<flag name="teamd">Enable Teamd control support</flag>
 		<flag name="wifi">Enable support for wifi and 802.1x security</flag>
-		<flag name="wext">Enable support for the deprecated Wext (Wireless
-			Extensions) API; needed for some older drivers (e.g. ipw2200,
-			ndiswrapper)</flag>
+		<flag name="wext">
+			Enable support for the deprecated Wext (Wireless Extensions) API; needed
+			for some older drivers (e.g. ipw2200, ndiswrapper)
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-1.32.2.ebuild b/net-misc/networkmanager/networkmanager-1.32.2.ebuild
new file mode 100644
index 000000000000..0ab6357947d6
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.2.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-nft=/sbin/nft
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			src/libnm-client-impl/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7fe93e7d63b0..4045d066afcf 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/blueman/blueman-2.2.1.ebuild b/net-wireless/blueman/blueman-2.2.1.ebuild
index 98700e5aa44f..3684a53acc84 100644
--- a/net-wireless/blueman/blueman-2.2.1.ebuild
+++ b/net-wireless/blueman/blueman-2.2.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 fi
 
 # icons are GPL-2
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9a7826fa6f69..d4fc24ce1dac 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 4b196ab45f10..418690e8ef54 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -4,6 +4,9 @@
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# Matt Turner <mattst88@gentoo.org> (2021-07-05)
+nftables
+
 # Michał Górny <mgorny@gentoo.org> (2021-05-20)
 # Unresolved keywordreqs are getting in the way.
 # https://bugs.gentoo.org/773451
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index fad94c8bc5f3..e5f2e3039e40 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -24,6 +24,7 @@
 # Matt Turner <mattst88@gentoo.org> (2021-06-02)
 # dev-util/gi-docgen does not have stable keywords on hppa
 x11-libs/gdk-pixbuf gtk-doc
+x11-libs/pango gtk-doc
 
 # Sam James <sam@gentoo.org> (2021-06-01)
 # sys-apps/systemd is not stable on hppa
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index afb5750d55e6..5b0df73f6d2b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,47 +1,59 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+# sys-cluster/ucx fails to compile on this arch
+sys-cluster/slurm ucx
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+# net-dialup/mgetty fails to compile on this arch
+mail-mta/courier fax
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+#   dev-db/postgresql not keyworded here yet
+dev-db/libdbi-drivers postgres
+dev-libs/cyrus-sasl postgres
+mail-mta/courier postgres
+net-libs/courier-authlib postgres
+
 # Ye Cao <ye.c@rioslab.org> (2021-07-02)
 # Dependencies not keyworded, not tested
 app-text/texlive-core xetex
 dev-python/ipython nbconvert notebook
 dev-python/matplotlib cairo excel wxwidgets
 media-sound/alsa-utils libsamplerate
-sci-libs/fftw mpi
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-02)
+# Yixun Lan <dlan@gentoo.org> (2021-05-24)
+#   net-fs/samba not keyworded here yet
+app-misc/mc samba
+gnome-base/gvfs samba
+net-libs/libsoup samba
+www-client/elinks samba
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
 #  - gnome-base/gconf, dev-libs/libotf & dev-libs/m17n-lib, net-libs/webkit-gtk
 app-editors/emacs gconf m17n-lib xwidgets
 #  - net-fs/openafs
 app-crypt/heimdal afs
-#  - dev-util/cmocka  (note: tests are restricted anyway)
-app-crypt/mit-krb5 test
 #  - MANY, to be reviewed
 dev-cpp/eigen doc test
-#  - mail-mta/courier | net-mail/courier-imap, dev-db/postgresql
-dev-libs/cyrus-sasl authdaemond postgres
+#  - dev-python/pygraphviz & sci-libs/gdal, dev-python/pandas
+dev-python/networkx extras pandas
 #  - sci-libs/umfpack (and a lot of its own deps in turn)
 dev-python/scipy sparse
 #  - dev-db/libdbi, sys-cluster/ceph
 net-analyzer/rrdtool dbi rados
-#  - virtual/mpi[fortran]
-sci-libs/arpack mpi
-#  - net-fs/samba, dev-libs/tre
-www-client/elinks samba tre
+#  - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
+sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_dynamic-sl openmpi_ofed_features_rdmacm openmpi_ofed_features_udcm
+#  - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
+sys-cluster/slurm hdf5 ofed slurmdbd
 
 # Ye Cao <ye.c@rioslab.org> (2021-06-24)
 # Dependencies not keyworded, not tested
 media-gfx/imagemagick fftw openexr wmf
 
-# Marek Szuba <marecki@gentoo.org> (2021-06-21)
-# net-fs/samba not keyworded here, not tested
-app-misc/mc samba
-
-# Marek Szuba <marecki@gentoo.org> (2021-05-31)
-# dev-python/networkx not keyworded here
-app-portage/nattka depgraph-order
-
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
 # Dependencies not keyworded, not tested
 dev-libs/libdbusmenu test
@@ -53,7 +65,7 @@ dev-libs/libbytesize test
 sys-libs/libblockdev dmraid escrow
 app-text/docbook-xsl-ns-stylesheets ruby
 app-misc/geoclue modemmanager zeroconf
-gnome-base/gvfs bluray cdda gnome-online-accounts google mtp ios samba test zeroconf
+gnome-base/gvfs bluray cdda gnome-online-accounts google mtp ios test zeroconf
 sys-power/upower ios
 net-libs/webkit-gtk gstreamer
 xfce-base/xfce4-settings colord libcanberra
@@ -99,10 +111,6 @@ app-crypt/pinentry efl
 # Dependency not keyworded on this arch.
 app-text/enchant voikko
 
-# Lars Wendler <polynomial-c@gentoo.org> (2020-12-07)
-# No riscv keyword in sys-apps/hwloc
-sys-process/htop hwloc
-
 # Patrick McLean <chutzpah@gentoo.org> (2020-04-16)
 # dev-python/breathe not keyworded here, mask to facilitate
 # keywording dev-libs/libfido2
@@ -123,7 +131,6 @@ dev-libs/libpcre jit
 
 app-admin/syslog-ng amqp dbi geoip2 kafka mongodb redis spoof-source smtp snmp test
 app-arch/p7zip wxwidgets
-app-crypt/gnupg wks-server
 app-crypt/mit-krb5 doc
 app-doc/doxygen doc
 app-editors/emacs mailutils
@@ -131,7 +138,6 @@ app-misc/pax-utils python
 app-text/asciidoc test
 app-text/ghostscript-gpl cups
 app-text/po4a test
-dev-libs/boost mpi
 dev-libs/check subunit
 dev-libs/libgcrypt doc
 dev-python/argcomplete test
@@ -149,7 +155,6 @@ dev-util/pkgconf test
 dev-vcs/git cvs highlight subversion
 dev-vcs/mercurial zsh-completion
 media-libs/harfbuzz doc
-sys-libs/libomp hwloc
 sys-libs/libcxx libcxxabi libunwind static-libs
 sys-libs/libcxxabi libunwind
 media-gfx/graphviz devil svg pdf
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 719b190a828c..1da3c44b0864 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -15,6 +15,17 @@
 -gtk3
 -introspection
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+# dev-lang/lua:5.2 and dev-lang/luajit known not to work here
+lua_single_target_lua5-2
+lua_single_target_luajit
+lua_targets_lua5-2
+lua_targets_luajit
+# dev-lang/lua:5.1 needs run-time testing, it passes build-time tests
+# but its test suite is much less comprehensive than that of 5.2+
+lua_single_target_lua5-1
+lua_targets_lua5-1
+
 # Ben Kohler <bkohler@gentoo.org> (2019-01-09)
 # no fam providers keyworded yet
 fam
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index d37141e9b8b4..12955cfde540 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Aaron W. Swenson <titanofold@gentoo.org> (2021-07-05)
+# PostgreSQL 9.5 masked for removal
+postgres_targets_postgres9_5
+
 # David Seifert <soap@gentoo.org> (2021-06-20)
 # Abandoned upstream, last release 17 years ago, unmaintained, tons of
 # QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
diff --git a/profiles/default/linux/ppc64/17.0/systemd/eapi b/profiles/default/linux/ppc64/17.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64/17.0/systemd/parent b/profiles/default/linux/ppc64/17.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index d92f83aeac0e..845b9573adfb 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -11,6 +11,7 @@ kde-plasma/plasma-firewall
 app-admin/gnome-abrt
 >=dev-libs/libreport-2.9
 games-util/gamemode
+gnome-extra/gnome-logs
 gnome-extra/gnome-user-share
 
 # Göktürk Yüksek <gokturk@gentoo.org> (2016-11-09)
@@ -24,35 +25,10 @@ www-misc/profile-sync-daemon
 # systemd has no support in the SELinux policy at the moment.
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_systemd.3F
 app-admin/systemdgenie
-app-eselect/eselect-gnome-shell-extensions
 app-office/wps-office
 sys-apps/systemd
 app-admin/calamares
 dev-python/python-systemd
-gnome-base/gdm
-gnome-base/gnome
-gnome-base/gnome-applets
-gnome-base/gnome-extra-apps
-gnome-base/gnome-flashback
-gnome-base/gnome-light
-gnome-base/gnome-panel
-gnome-base/gnome-shell
-gnome-extra/chrome-gnome-shell
-gnome-extra/gnome-logs
-gnome-extra/gnome-shell-extensions
-gnome-extra/gnome-shell-frippery
-gnome-extra/gnome-shell-extensions-topicons-plus
-gnome-extra/gnome-shell-extension-appindicator
-gnome-extra/gnome-shell-extension-applications-overview-tooltip
-gnome-extra/gnome-shell-extension-bing-wallpaper
-gnome-extra/gnome-shell-extension-bluetooth-quick-connect
-gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen
-gnome-extra/gnome-shell-extension-dash-to-panel
-gnome-extra/gnome-shell-extension-desktop-icons
-gnome-extra/gnome-shell-extension-desktop-icons-ng
-gnome-extra/gnome-shell-extension-gsconnect
-gnome-extra/gnome-shell-extension-pop-shell
-gnome-extra/gnome-tweaks
 x11-themes/zukitwo-shell
 gnome-extra/office-runner
 gnome-extra/pch-session
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index fa0016533bcc..40676d30d5c5 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -14,14 +14,10 @@ net-analyzer/wireshark sdjournal
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
 app-emulation/libvirt firewalld
 gnome-base/gdm wayland
+gnome-base/gnome-extra-apps share
 net-firewall/fwknop firewalld
 www-servers/uwsgi uwsgi_plugins_systemd_logger
 >=x11-wm/mutter-3.22 wayland
-x11-misc/xscreensaver gdm
-x11-misc/gpaste gnome
-x11-terms/gnome-terminal gnome-shell
-x11-themes/arc-theme gnome-shell
-x11-themes/zukitwo gnome-shell
 net-wireless/bluez user-session
 
 # Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
diff --git a/profiles/package.mask b/profiles/package.mask
index b4d0e1ef4863..efb960431d05 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,39 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2021-07-06)
+# Upstream changed license to GPL-3+ in order to deliberately cause
+# incompatiblity with revdep licenses.  Mask until the situation
+# is resolved.  Bug #791259.
+>=media-libs/libopenaptx-0.2.1
+
+# Aaron W. Swenon <titanofold@gentoo.org> (2021-07-05)
+# PostgreSQL 9.5 has reached end of life and will no longer receive any
+# updates -- security or otherwise -- from upstream or Gentoo.
+#
+# You should migrate immediately.
+#     https://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Post-9.0_Migration
+#
+# For more information about PostgreSQL's versioning policy, see:
+#     https://www.postgresql.org/support/versioning/
+#
+# Removal after 2021-08-04.
+dev-db/postgresql:9.5
+
+# Michał Górny <mgorny@gentoo.org> (2021-07-06)
+# Various Python 2-specific backports.  All the reverse dependencies
+# (except for deps between these packages) have been eliminated.
+# Removal on 2021-08-05.  Bug #800698.
+dev-python/contextlib2
+dev-python/linecache2
+dev-python/traceback2
+dev-python/unittest2
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-07-05)
+# The platform is outdated and not maintained anymore.
+# Mask for removal in 30 days.
+dev-haskell/haskell-platform
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-04)
 # severely broken nfs
 # possibly depper problem due to bug in mm/page_alloc
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 6328acc2d092..3f917d7f4b0e 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -181,6 +181,7 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/developer		stable
 ppc64		default/linux/ppc64/17.0				exp
 #ppc64		 default/linux/ppc64/17.0/desktop			exp
 #ppc64		 default/linux/ppc64/17.0/desktop/gnome			exp
+ppc64		default/linux/ppc64/17.0/systemd			exp
 #ppc64		 default/linux/ppc64/17.0/desktop/gnome/systemd		exp
 #ppc64		 default/linux/ppc64/17.0/developer			exp
 ppc64		default/linux/ppc64/17.0/musl				exp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d55dc4b172ee..7f1066d4e89a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2140,7 +2140,9 @@ dev-libs/libzip:mbedtls - Use net-libs/mbedtls as TLS provider
 dev-libs/libzip:tools - Install binary tools to compare, modify and merge zip files
 dev-libs/link-grammar:aspell - Adds support for app-text/aspell spell checker
 dev-libs/link-grammar:hunspell - Adds support for app-text/hunspell spell checker
+dev-libs/log4cplus:explicit-initialization - Require explicit initialization
 dev-libs/log4cplus:iconv - Use inconv for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
+dev-libs/log4cplus:server - Build the logging server
 dev-libs/log4cplus:working-c-locale - Use the C99 locale facilities for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
 dev-libs/log4cplus:working-locale - Use C++'s std::locale for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
 dev-libs/log4cxx:smtp - Offer SMTP support via net-libs/libesmtp
@@ -3024,6 +3026,7 @@ games-emulation/dosbox:core-inline - Enable memory-increasing inlines for better
 games-emulation/dosbox:glide - Enable unofficial Glide emulation via media-libs/openglide
 games-emulation/dosbox-staging:dynrec - Use recompiling cpu core instead of dynamic x86/x64 specific cpu core
 games-emulation/dosbox-staging:fluidsynth - use media-sound/fluidsynth for MIDI emulation
+games-emulation/dosbox-staging:mt-32 - use media-sound/munt for MT-32 emulation
 games-emulation/dosbox-staging:network - Enable networking features (modem, ipx)
 games-emulation/dosbox-staging:opus - Support compressed audio tracks (.opus) used with CDROM images
 games-emulation/generator:sdlaudio - Enable SDL Audio
@@ -6474,12 +6477,14 @@ net-misc/mrouted:rsrr - Enable Routing Support for Resource Reservations, for RS
 net-misc/mulk:checksum - Enable checksum verification for Metalink from dev-libs/openssl
 net-misc/mulk:metalink - Enable support for media-libs/libmetalink
 net-misc/netkit-bootparamd:libtirpc - Build against net-libs/libtirpc for RPC support
-net-misc/networkmanager:connection-sharing - Use net-dns/dnsmasq and net-firewall/iptables for connection sharing
-net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting ip
-net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting ip
+net-misc/networkmanager:connection-sharing - Support connection sharing (uses net-dns/dnsmasq)
+net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting an IP via DHCP
+net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting an IP
 net-misc/networkmanager:elogind - Use sys-auth/elogind for session tracking
+net-misc/networkmanager:iptables - Use net-firewall/iptables for connection sharing
 net-misc/networkmanager:iwd - Use net-wireless/iwd instead of net-wireless/wpa_supplicant for wifi support by default
 net-misc/networkmanager:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
+net-misc/networkmanager:nftables - Use net-firewall/nftables for connection sharing
 net-misc/networkmanager:nss - Use dev-libs/nss for cryptography
 net-misc/networkmanager:ofono - Use net-misc/ofono for telephony support.
 net-misc/networkmanager:ovs - Enable OpenVSwitch support
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e1b1ebbb6114..ca4a4c691dc4 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a5e15147c50a..c67ec7c7e6ff 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,3 +2,4 @@ DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a
 DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16eeca01510166e3d74c36eb00da72c27d8582ccda124151143561c29b8e59dc3dd800c474b77991417b33acd1 SHA512 d7ff8773d3f1cb894fce89f56a3d4355769f1113eefb1367a3a543ced750e2c42618a4a1deef3a338ddd4d33b7332ae962b2d793f8c0b97e31ed4b84cb2df2d5
 DIST gdal-3.2.3.tar.gz 18970990 BLAKE2B 9f2ac15b7e9d2df0393d15734030ec4777579aa01fcf2700958228b24fd50d574f3bd438c03e767549614a699c362b31f38cbb0f32ceb8056c9b55fab11ecfec SHA512 985a058a53f676f7d49a96d1a48d4f93c5da8548012bf81345afde03d8044022b210484290bca70c3d7a1ef3b0087d9e17c636b5badd1e0816c1f59b1bf21ee8
 DIST gdal-3.3.0.tar.gz 19572446 BLAKE2B afc7ce3c2191fb7607fdf3a01e7ed3e83c601fa063019015f666e0c550e4e42129b8782568f20f97422308f95b4e5c3dbd2311d562b7ec0830635e47e7c931b4 SHA512 39505c07aaf4dac587a189a979462101a7acba41e8732031540ebad02e089820658943ebb48c20f4ea56548363033b2db2f03f41c8a91ff5c5997a19b5eb999e
+DIST gdal-3.3.1.tar.gz 19582883 BLAKE2B 328ba9f3c6a2ecca8583648e5f22469d3fbabf8d8676262a15c6debe718be8329ad3899cbe5397dff2896bc9c2500b60834c6a44cd0f5b670828d86838611f0d SHA512 0eb89502f1cebd5dd899fb8f20571952462c45aba6cee1d62ccc820b2fed5202f6c7e7096bd4ca6c0cfcc2de623f00295097a7e33da6ffa5624dcb8a7a0dc682
diff --git a/sci-libs/gdal/gdal-3.3.1.ebuild b/sci-libs/gdal/gdal-3.3.1.ebuild
new file mode 100644
index 000000000000..a81cf8d3765a
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.3.1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop a --prefix hack in the upstream build system
+	# We don't want the line at all, so let's just drop it rather than
+	# trying to put in the right libdir value.
+	# bug #696106
+	sed -e '/\$ADD_PREFIX\/lib/d' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+
+	# autoconf 2.70+
+	# bug #775209
+	config_rpath_update .
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-lto
+		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
+		--enable-shared
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
+		--with-crypto
+		--with-cryptopp=no
+		--with-expat
+		--with-geotiff
+		--with-gnm
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}"/usr
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}"/usr
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-perl
+		--without-podofo
+		--without-python
+		--without-qhull
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux-xml pam)
+		$(use_with curl)
+		$(use_with cpu_flags_x86_avx avx)
+		$(use_with cpu_flags_x86_sse sse)
+		$(use_with cpu_flags_x86_ssse3 ssse3)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		perl_delete_localpod
+	fi
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.rst README-python.rst
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index f5d06499c8fc..7a85e7ff274f 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1 +1,2 @@
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
+DIST libgeotiff-1.7.0.tar.gz 541931 BLAKE2B 3c0843f8c86d6bbcedf9d07b45d2d676f1ccfaba7b5e40fa7f8d5f290b39da5cfaebe39567eab9e8add1b99042aad51d5104b81c2c05493d18d022d41e5b106b SHA512 8e294b5db89e88dbd4f7eb9d804be788ff3d14a1a14f721e9805b42cc797500596f0473dd8e5be6c1da01b56bdebc872df2b30470a2d96686f308019de10739a
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
new file mode 100644
index 000000000000..746a584a921c
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.0.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
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
+HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff"
+SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug doc"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+DEPEND="
+	>=media-libs/tiff-3.9.1:0
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib
+	virtual/jpeg:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "s:-O3::g" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-debug=$(usex debug) \
+		--with-jpeg="${EPREFIX}"/usr \
+		--with-zip="${EPREFIX}"/usr
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		mkdir -p docs/api || die
+		cp "${FILESDIR}"/Doxyfile Doxyfile || die
+		doxygen -u Doxyfile || die "updating doxygen config failed"
+		doxygen Doxyfile || die "docs generation failed"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( docs/api/. )
+
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild b/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
index 293e9185760a..35672fd3c7e3 100644
--- a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index c5bca2ca5e70..6e3fbe16ce71 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,4 +1,5 @@
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
+DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
diff --git a/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch
new file mode 100644
index 000000000000..c88fe83cb509
--- /dev/null
+++ b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch
@@ -0,0 +1,29 @@
+https://patch-diff.githubusercontent.com/raw/OSGeo/PROJ/pull/2760.patch
+
+From fc983b6e3343ba4d52fd0a889bb6bbf6f143f417 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Thu, 1 Jul 2021 21:24:26 +0200
+Subject: [PATCH] =?UTF-8?q?test=5Ffactory.cpp:=20fix=20build,=20in=20parti?=
+ =?UTF-8?q?cular=20on=20Alpine=20Edge=20(fixes=C2=A0#2759)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ test/unit/test_factory.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
+index 985499150e..a60296d10a 100644
+--- a/test/unit/test_factory.cpp
++++ b/test/unit/test_factory.cpp
+@@ -39,6 +39,8 @@
+ #include "proj/metadata.hpp"
+ #include "proj/util.hpp"
+ 
++#include <algorithm>
++
+ #include <sqlite3.h>
+ 
+ #ifdef _MSC_VER
+
diff --git a/sci-libs/proj/proj-7.2.1.ebuild b/sci-libs/proj/proj-7.2.1.ebuild
index 6bfd83430fca..11efd85db877 100644
--- a/sci-libs/proj/proj-7.2.1.ebuild
+++ b/sci-libs/proj/proj-7.2.1.ebuild
@@ -7,7 +7,7 @@ DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
 EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
 
 DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
+HOMEPAGE="https://proj.org/"
 SRC_URI="
 	https://download.osgeo.org/proj/${P}.tar.gz
 	https://download.osgeo.org/proj/${DATUMGRID}
diff --git a/sci-libs/proj/proj-8.0.1.ebuild b/sci-libs/proj/proj-8.0.1.ebuild
index c6a3966a2684..d9e6bfd7022b 100644
--- a/sci-libs/proj/proj-8.0.1.ebuild
+++ b/sci-libs/proj/proj-8.0.1.ebuild
@@ -9,7 +9,7 @@ DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
 EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
 
 DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
+HOMEPAGE="https://proj.org/"
 SRC_URI="
 	https://download.osgeo.org/proj/${P}.tar.gz
 	https://download.osgeo.org/proj/${DATUMGRID}
diff --git a/sci-libs/proj/proj-8.1.0-r1.ebuild b/sci-libs/proj/proj-8.1.0-r1.ebuild
new file mode 100644
index 000000000000..501de56a4e62
--- /dev/null
+++ b/sci-libs/proj/proj-8.1.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${DATUMGRID}
+	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/23"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="curl europe test +tiff"
+REQUIRED_USE="test? ( !europe )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	curl? ( net-misc/curl )
+	tiff? ( media-libs/tiff )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test_factory-include.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}"/data || die
+	mv README README.DATA || die
+
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_CURL=$(usex curl)
+		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_TIFF=$(usex tiff)
+	)
+
+	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 80b48670cee4..eb5cf9a2ee95 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
index 6ba64e4dd9ce..3243004fadd2 100644
--- a/sci-mathematics/lcalc/Manifest
+++ b/sci-mathematics/lcalc/Manifest
@@ -1 +1 @@
-DIST lcalc-2.0.1.tar.xz 849260 BLAKE2B 141044939b50903f5aa631ee7ca76ed1ffc65fd0604701376b67172a8f70bcded2a9303ac3f653b20b8a05da44034f21f775dbe98f6efd38cd4097957f5f5466 SHA512 cf7210cd79dad416e3c4cdc08a6ed276d88483b8dfc425fe2ed4a1592b8a31f82ed5ec7cc7b6308ac80d44cf20e9a07484e2004bbfdeabbbabf843d24d15cc2a
+DIST lcalc-2.0.2.tar.xz 849376 BLAKE2B a6e14a368bcf6e36f19a8b7d22b74555101f4a25d8e178ac51b8138610cc43ad3e9a71eac70596360627fb62791a28a9cca0148abb1966689037b63dfcee99d8 SHA512 b551d712d500cf061966afe85abbcc1fc27ac9c93676cf546d0c3c9a6ad13bf36efe2761394f4aa334a508640fe5ca40bcabec982126e6f5d34b6ab0be52ee75
diff --git a/sci-mathematics/lcalc/lcalc-2.0.1.ebuild b/sci-mathematics/lcalc/lcalc-2.0.2.ebuild
similarity index 89%
rename from sci-mathematics/lcalc/lcalc-2.0.1.ebuild
rename to sci-mathematics/lcalc/lcalc-2.0.2.ebuild
index 31632d687e6c..029a32215c02 100644
--- a/sci-mathematics/lcalc/lcalc-2.0.1.ebuild
+++ b/sci-mathematics/lcalc/lcalc-2.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Command-line utility and library for L-function computations"
 HOMEPAGE="https://gitlab.com/sagemath/lcalc"
-SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/01b46cdbbf3e67a322320dc0b2750d50/${P}.tar.xz"
+SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/e7158e6f51f40012ea97fbb9c798da56/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 # The subslot is the libLfunction soname major version
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index d2046110e1e2..7ffcc279bbf9 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,2 +1,2 @@
 DIST planarity-3.0.0.5.tar.gz 492644 BLAKE2B d183bc07cab7246b62cc7340956206e3f6c5999aa92b223e7665ebd8ae1bc0c354011c078ea4f42d2e45efa2ae5e83e082e4c8d80e3391a4f20be1020ebf8188 SHA512 dfeb7e024e1f5758e5abbd854c4ca963b4f5d45433b2c5eb00ce85c154b5407ebccd1ace0db167488dee757db2c23367101a2aa568941a3664bac9058ea24328
-DIST planarity-3.0.1.0.tar.gz 442280 BLAKE2B c71f8770e92efd8b322d5c5d3f9a3a2917891ae39e41b3f76ac36d74e5e197f18dcfac82d802fb80eeeaac99bcfa5f1a91408f1cf82c7a289321ede7fc97fc04 SHA512 0ad6d7edbd31f29c9b39cc8c7918a9976e5849cf2ca9eefbb260478666ea8d0bac21647e939994ceef7d294436dd12a403520690da14407d45ef25267300282d
+DIST planarity-3.0.1.1.tar.gz 456236 BLAKE2B 60040c8e205dbd9eb67667c6554836a9545bab74ccfb51e319edb191425f1b74403916e7887d06cb2d570eb17694338819ee5fd9828d6636ebecbade8915cdfa SHA512 50d2b6905d20252a6d482aae15984673972508540416a3e9396ff67923bf3bfb5668ef00309d42e540e5c8dd3ac4636ef54da2e5ee334075e87d2f3af6488035
diff --git a/sci-mathematics/planarity/planarity-3.0.1.0.ebuild b/sci-mathematics/planarity/planarity-3.0.1.1.ebuild
similarity index 84%
rename from sci-mathematics/planarity/planarity-3.0.1.0.ebuild
rename to sci-mathematics/planarity/planarity-3.0.1.1.ebuild
index ff50336d2e9e..95a315b6104f 100644
--- a/sci-mathematics/planarity/planarity-3.0.1.0.ebuild
+++ b/sci-mathematics/planarity/planarity-3.0.1.1.ebuild
@@ -1,22 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="The edge addition planarity suite of graph algorithms"
 HOMEPAGE="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
 
 SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${PV}/${P}.tar.gz"
-IUSE="static-libs"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9b3b354e5591..89d58a44a0f0 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/bolt/bolt-0.9-r2.ebuild b/sys-apps/bolt/bolt-0.9-r2.ebuild
deleted file mode 100644
index 778cd7da043b..000000000000
--- a/sys-apps/bolt/bolt-0.9-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	dev-util/glib-utils
-	virtual/libudev
-	virtual/udev
-	dev-util/umockdev
-	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd )
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 5 6; then
-		CONFIG_CHECK="~THUNDERBOLT"
-		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
-	else
-		CONFIG_CHECK="~USB4"
-		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
-	fi
-	check_extra_config
-
-	CONFIG_CHECK="~HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
-	check_extra_config
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman=$(usex doc true false)
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--sharedstatedir=/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}"/${PN}.openrc boltd
-	keepdir /var/lib/boltd
-}
diff --git a/sys-apps/bolt/bolt-0.9.1.ebuild b/sys-apps/bolt/bolt-0.9.1.ebuild
index 34cd766665ec..d0f8d019bc70 100644
--- a/sys-apps/bolt/bolt-0.9.1.ebuild
+++ b/sys-apps/bolt/bolt-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc systemd"
 
 DEPEND="
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index f98a08eb4cda..7142d8ae3ffa 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index b84b64315a1e..b35afa12de16 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="!sys-apps/man"
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 23ea87223d6c..b0564243c359 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/munge/munge-0.5.13-r1.ebuild b/sys-auth/munge/munge-0.5.13-r1.ebuild
index 6d57251b5672..0376f12d7bc8 100644
--- a/sys-auth/munge/munge-0.5.13-r1.ebuild
+++ b/sys-auth/munge/munge-0.5.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug gcrypt static-libs"
 
 DEPEND="
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ee8eb968f827..cf268dbae73b 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/fio/fio-3.27.ebuild b/sys-block/fio/fio-3.27.ebuild
index 2a78e187bb6a..1a61f8f61665 100644
--- a/sys-block/fio/fio-3.27.ebuild
+++ b/sys-block/fio/fio-3.27.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	gnuplot? ( python )
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6234915fdaf4..af5775978fe7 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/nullmpi/nullmpi-0.7.ebuild b/sys-cluster/nullmpi/nullmpi-0.7.ebuild
index b5c5cc6dabc2..1ad6a5790d63 100644
--- a/sys-cluster/nullmpi/nullmpi-0.7.ebuild
+++ b/sys-cluster/nullmpi/nullmpi-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://wissrech.ins.uni-bonn.de/research/projects/nullmpi/${PF}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
index 0f2a2af8b199..a0d9dbe3129a 100644
--- a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.open-mpi.org"
 SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
 IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
index 7f857b26e59b..f8a84798d701 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	INHERIT_GIT=""
 	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
@@ -78,6 +78,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
 )
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 3def8e696c1c..0ec3060e1d8f 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
 
 LICENSE="torque-2.5"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk"
 
 DEPEND_COMMON="
diff --git a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
index b1b15f27d9e1..e58df1950af4 100644
--- a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
+++ b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 -riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+numa +openmp"
 
 RDEPEND="
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 34431aa78fec..cb0c201898e5 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-devel/clang-common/clang-common-12.0.1_rc4.ebuild b/sys-devel/clang-common/clang-common-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..03e4441b91b9
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-12.0.1_rc4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/clang-runtime-12.0.1_rc4.ebuild b/sys-devel/clang-runtime/clang-runtime-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..218cdb1426f6
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-12.0.1_rc4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index d17ae5b6d2a1..3a6c9e94e726 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -10,3 +10,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-devel/clang/clang-12.0.1_rc4.ebuild b/sys-devel/clang/clang-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..79cb7d851883
--- /dev/null
+++ b/sys-devel/clang/clang-12.0.1_rc4.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Frontend/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/distcc/distcc-3.4.ebuild b/sys-devel/distcc/distcc-3.4.ebuild
index 6906d6c786fc..23516be1cd78 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 320ac8a886d8..08a24230ceda 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,19 +3,24 @@ DIST gcc-10.2.0-patches-6.tar.bz2 24103 BLAKE2B f719012f86136ad9c4ea1397548caca6
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
 DIST gcc-10.3.0-patches-2.tar.bz2 17688 BLAKE2B 8dc949208e0a4a3f0f106fabb9eb6e6787b1a829f9cfed6009d1328220e71926489b4f82a270cabcfa64af46e9892e72f5af2ce991c209055fcfab103cdfdde8 SHA512 053e67f778105062f1246cc09f6f8973d663855ab6d0ba976575e4b8f62e667dc05c058d4b3ae33c135292533c8f9a44b6f7a71f14435962b4becaf49848dc80
+DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
 DIST gcc-11.1.0-patches-1.tar.bz2 12130 BLAKE2B 4d763b83dba7875bbbe8bbb9b6c392791ba97037d17347548604ffa7c70b32fdafcd45b0722ae40aa3aa8cbb34b9f3e3aa399d0096e35e74f75b174aad0c032e SHA512 e4e363c6a81bbc423ec36b6c57801ea2a70961ee7d7d0333924c7012b2b6fd4008f53e9208b5d1f6025f9e74a95d46c121b4b8909827070b46091228688996a4
 DIST gcc-11.1.0-patches-2.tar.bz2 18492 BLAKE2B 37ffb2b2a92287c434d3730772b73b88926788db8b609611447318a28fd43963fa04ee664bb1c83815ee80742457ab703f7bc2d1e6d700e342760b1d9cd13867 SHA512 62297a37b0f1ff48858c59f761291f0fc4efe14bd471d53763899c2f272cc21764d4521682219a57857118e846766dcb9e24646f749d735acd58bb2d7b8b05d6
+DIST gcc-11.1.0-patches-3.tar.bz2 19670 BLAKE2B bd37b28beb8ee387d03466bdb8e81b6f8f8a4bec3cdd012db84439166855eb6f465e2232e0472f9369a74c240af2a035d1023abcdd5058a7d9e27b0cb1709716 SHA512 b18102b70b77ec1328eec7f9e03fd083649af97845a6ecd68bf3cac128571e3b25a99823ce29cede8c6bcb9b0f31288a2e5a8f5d59cfad2b1278c420bf9e2149
 DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
 DIST gcc-12.0.0-patches-1.tar.bz2 12137 BLAKE2B 1b5a07c4e0996b559cc5d57c5a0ade76983d80f3dc8f87e67b95b54114f7adcf3a78bd409123e7f414e33cf3114da9fab3491fd7cb39e337a22c1d6b562842e5 SHA512 fb5464a0b55446b2c99b6cb50e70404a723925b6bea322855ed4d2f66bdff70aab22e93d1e6d7d72d8a1451cac919d0d07b2a6caf0d953fa1692fb3422b2528c
 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
+DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
+DIST gcc-7.5.0-patches-4.tar.bz2 13183 BLAKE2B 38a56910f01ef4172182d2145cef1df53b57eaa8f0655223cf54689e7ce12a264bfbb3735bde42b8a8594ab44031d9c48dc0d5303fab6537746f05e4d46b427a SHA512 28d3732d5351dabd1452ee0462865a0de00103d9ea66941e38499c532b34ee8beb150b0b32af58cde901e437b4c256593c29736a5e7df2575aa0d0c43b6cf6eb
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
 DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb
 DIST gcc-8.4.0-patches-3.tar.bz2 16890 BLAKE2B 29b537faf6fbf5ee43a72ea622090c17a28e19b903807d64302ef9a53c4eddc796c32e4f522ae0b724dda527ee073ba436e8803384d6d73d5e715653f89f59a3 SHA512 3f44e05d271c877eb2183731d4faccfdd66ac392bb8a541256d4d58c9e26bd205a53b9c881cc9c457cece55596cfbd8c6278be9509f3b151bb5e43206ce80188
 DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 DIST gcc-8.5.0-patches-1.tar.bz2 15655 BLAKE2B 7a0c15ba27e0bc1f19527a972f5100fb88fe367b29e46c6c7a0c3d00ae2c0c63449cf95775238a2369cd4d6f0e5c58da086ccf4c13d06b1264063a801dffcec2 SHA512 72dabf104a938f9eaab1f188ee945d4b22b9e85650fc1a878314ab37a4e5682b43476a6a9e87561d9b8eabcb40fd8e377369b03a0e73ac12d1b0f5ab6529419f
+DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
diff --git a/sys-devel/gcc/gcc-10.3.0-r2.ebuild b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
new file mode 100644
index 000000000000..4ad3b3ca407c
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.1.0-r2.ebuild b/sys-devel/gcc/gcc-11.1.0-r2.ebuild
new file mode 100644
index 000000000000..b0cbe26c743d
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.1.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-6.5.0-r4.ebuild b/sys-devel/gcc/gcc-6.5.0-r4.ebuild
new file mode 100644
index 000000000000..3136ac508c4a
--- /dev/null
+++ b/sys-devel/gcc/gcc-6.5.0-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="6"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/gcc-7.5.0-r2.ebuild b/sys-devel/gcc/gcc-7.5.0-r2.ebuild
new file mode 100644
index 000000000000..63d0a121cf09
--- /dev/null
+++ b/sys-devel/gcc/gcc-7.5.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="4"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
index 3d3c3ef7b564..2f88dda2bf46 100644
--- a/sys-devel/gcc/gcc-8.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.5.0-r1.ebuild b/sys-devel/gcc/gcc-8.5.0-r1.ebuild
new file mode 100644
index 000000000000..5141e9aa3b31
--- /dev/null
+++ b/sys-devel/gcc/gcc-8.5.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="2"
+
+inherit toolchain
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/gcc-8.5.0.ebuild b/sys-devel/gcc/gcc-8.5.0.ebuild
index 96796a936b12..25bd0b691652 100644
--- a/sys-devel/gcc/gcc-8.5.0.ebuild
+++ b/sys-devel/gcc/gcc-8.5.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-devel/lld/lld-12.0.1_rc4.ebuild b/sys-devel/lld/lld-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..da442603c870
--- /dev/null
+++ b/sys-devel/lld/lld-12.0.1_rc4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)"
+
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-devel/llvm-common/llvm-common-12.0.1_rc4.ebuild b/sys-devel/llvm-common/llvm-common-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..53511a0a20e3
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-12.0.1_rc4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index a4a462a022a8..5901f0acde8d 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -10,3 +10,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-devel/llvm/llvm-12.0.1_rc4.ebuild b/sys-devel/llvm/llvm-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..09568c1ceda7
--- /dev/null
+++ b/sys-devel/llvm/llvm-12.0.1_rc4.ebuild
@@ -0,0 +1,518 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-elfabi
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-undname
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 70d32990833a..19b65e138dbd 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 33639dede7e7..39bebf1e8397 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index fbe409e38853..23c420f21ebc 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/growpart/growpart-0.0.32.ebuild b/sys-fs/growpart/growpart-0.0.32.ebuild
index aa8ac8c42c28..0870eae20f3b 100644
--- a/sys-fs/growpart/growpart-0.0.32.ebuild
+++ b/sys-fs/growpart/growpart-0.0.32.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 8820e6aa1e1b..e9b1d1e10488 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index d304f891838f..8fe9c4e878a4 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,19 +1,24 @@
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
+DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
+DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST btrfs-progs-v5.11.tar.xz 2212292 BLAKE2B e19933e1c0d3f80db931554c1cb4b1d25c5b2f2c5ea0ec19623696b24d696247536d615d569cc28c9a84b1484e38141945465251272b2d1df2cadde5af4dee88 SHA512 20b10ba0f6978d0cb202f055edf41abeb36b629fd6d5cc7cb9ebc82ef79d2bef31ff7c9681770c7ea7b126cfb4cafd6d610476fd5cc7506189f74dc214445cf0
+DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
 DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
 DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
 DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a
+DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
+DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
@@ -23,6 +28,7 @@ DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
 DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
 DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
+DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
@@ -33,15 +39,20 @@ DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
 DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
+DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
+DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
+DIST libgcrypt-1.9.3.tar.bz2 3219061 BLAKE2B 51a6273ba28829c016d9a93fffa181aec24170d0e4d3a363c788f336219e1531274344adeea289f3cc09161fdb2e56846551367a8ac880b14e03a52ab0dd551a SHA512 977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
+DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
+DIST libxcrypt-4.4.23.tar.gz 536009 BLAKE2B b7311dec9e528abf6229f6c105e806a31a1e525e71d26252c8f30a3e1dbd61a7752b7303bd167d9ddc99b04261f02e3c7b50cc36bbc3348a337f4089f6e1c6f3 SHA512 4d5854a082a8c707416507611881c1407f0ea0bda0557c5f7ae6b70d8dd1c7a0828afe29d8f2e7754f5f97b824aaa03671dae6d4dad329fcd131b94b77ddb713
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
@@ -49,6 +60,7 @@ DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2a
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31 SHA512 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0
+DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
 DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
 DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
@@ -58,10 +70,13 @@ DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
 DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
+DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
 DIST xfsprogs-5.11.0.tar.xz 1297180 BLAKE2B 0ae0c2eccdf124b9fc2f9a4ef71073324f3645bc9a4f2959978fa06ee4dae4ecaf4eee40e6b130b65eb390d8af0f9d1485aeac073a8ac5e30fce46eef9cdb7a4 SHA512 7a77f938a54176652ce0b53cab13509754aab560c02d74ab03a9fcebf2728d703f89ad9d281ef00fcc0dbabb5497cab2b2b656bbe7598037a16fff70126e5d66
+DIST xfsprogs-5.12.0.tar.xz 1299332 BLAKE2B 96e8831ca83d362792853188939017b53343232c99ed514fda50ea9afa828ea8f8ecc753249b211037c2635b45bfbcc849f90fe277102e4745e6b4f13fc6fc20 SHA512 d31263529cd5e0aad2b4414aca91f352c6df9de9a241655e43b5592a3ca120efdcfcd8cf84401ebd1b3fcf67027f0923fecc6f961bdaf12fb00c3ac67abd5fe7
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
+DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 3319be9340cb..a7c583a33ed9 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -6,42 +6,45 @@
 
 EAPI="7"
 
-inherit bash-completion-r1
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 python-single-r1
 
 # Whenever you bump a GKPKG, check if you have to move
 # or add new patches!
 VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.75.0"
-VERSION_BTRFS_PROGS="5.11"
-VERSION_BUSYBOX="1.33.0"
+VERSION_BOOST="1.76.0"
+VERSION_BTRFS_PROGS="5.12.1"
+VERSION_BUSYBOX="1.33.1"
 VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.5"
+VERSION_CRYPTSETUP="2.3.6"
 VERSION_DMRAID="1.0.0.rc16-3"
 VERSION_DROPBEAR="2020.81"
 VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.2.10"
+VERSION_EXPAT="2.4.1"
 VERSION_E2FSPROGS="1.46.2"
 VERSION_FUSE="2.9.9"
 VERSION_GPG="1.4.23"
-VERSION_HWIDS="20201207"
+VERSION_HWIDS="20210613"
 VERSION_ISCSI="2.0.878"
 VERSION_JSON_C="0.13.1"
-VERSION_KMOD="28"
+VERSION_KMOD="29"
 VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.2"
-VERSION_LIBGPGERROR="1.41"
-VERSION_LVM="2.02.187"
+VERSION_LIBGCRYPT="1.9.3"
+VERSION_LIBGPGERROR="1.42"
+VERSION_LIBXCRYPT="4.4.23"
+VERSION_LVM="2.02.188"
 VERSION_LZO="2.10"
 VERSION_MDADM="4.1"
 VERSION_POPT="1.18"
-VERSION_STRACE="5.11"
+VERSION_STRACE="5.12"
 VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
 VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.36.2"
-VERSION_XFSPROGS="5.11.0"
+VERSION_UTIL_LINUX="2.37"
+VERSION_XFSPROGS="5.12.0"
 VERSION_XZ="5.2.5"
 VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.9"
+VERSION_ZSTD="1.5.0"
 
 COMMON_URI="
 	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
@@ -64,6 +67,7 @@ COMMON_URI="
 	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
 	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
 	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
 	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
 	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
 	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
@@ -96,6 +100,7 @@ LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
 IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Note:
 # We need sys-devel/* deps like autoconf or automake at _runtime_
@@ -103,7 +108,7 @@ IUSE="ibm +firmware"
 # mdadm... during initramfs generation which will require these
 # things.
 DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="${PYTHON_DEPS}
 	app-arch/cpio
 	>=app-misc/pax-utils-1.2.2
 	app-portage/elt-patches
@@ -168,6 +173,7 @@ src_prepare() {
 		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
 		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
 		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
 		-e "s:VERSION_LVM:${VERSION_LVM}:"\
 		-e "s:VERSION_LZO:${VERSION_LZO}:"\
 		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
@@ -211,6 +217,9 @@ src_install() {
 	doins -r "${S}"/*
 
 	fperms +x /usr/share/genkernel/gen_worker.sh
+	fperms +x /usr/share/genkernel/path_expander.py
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
 
 	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
 	insinto /etc
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index c1e8385bea69..fa22204f20b0 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -124,6 +124,9 @@ DIST genpatches-5.12-9.extras.tar.xz 1772 BLAKE2B 127b452d6bca348b7ef8b501b6a2b6
 DIST genpatches-5.13-1.base.tar.xz 3840 BLAKE2B 5843b75d53225fb5f3ad278a69884c70d3eda165faeec7895dac661d035324c69fb32ec4ca729a025bc8e73b81a17f085f60294b621a646dcdf8bb389fc37e41 SHA512 62f49080e44895da1ecf0dd4d88dbcf3fc1f6b227c09aebf7b4acd407655e0a7627cfaf870b26ec5ab508ab2e9ce36e86ca92bceb19566c8e4a2c509a7c459af
 DIST genpatches-5.13-1.experimental.tar.xz 5436 BLAKE2B 266c9ff4d958fe80d4acd9e19538b67363ffcd2ff41ff83441cbe4808365a9bf4f32e395092eeaecd4e031b52cf17d0ae8616fa5ddd902a707e90736c654e486 SHA512 aa82c4c1d09d7fb47860e55f20595844170b7080134c8eaf350316f1c11c6ec2ff8fef9b4cef2e0e38128d372614861258a78da2c0a5d2e1053860643f16fe05
 DIST genpatches-5.13-1.extras.tar.xz 3412 BLAKE2B a93dc7964a3b26817e6a561b314e93958d887a08a519a8a8b1bf2e4bb78790ed03a217a54cb6d9b2af6f7a2f4e78f8a0fbebe2aac0c34c1c9b0ed884db3bbbb7 SHA512 f4470e1f4d72ef0d54b6b0bd6c427f722ffac8de9e8b0a29b69e032ce71d9c18ae447fa855bf4e9e45cd2084f0b7837d0514aebfd18f6a04a7a88a191e966435
+DIST genpatches-5.13-2.base.tar.xz 4716 BLAKE2B e954c7b553a44cf7772f305652b04e7c3e40faa3e3b03f8a32ba443ade2fc04cab4c97327703861887dd83ce593d5d4181008990e1aa6c7ba43f2e1f4bb9ae62 SHA512 9bdd1e674e4382631e43b6f668bba77ea13a1b2b0d1f7c3c8feda6d1dae4c55086981e6a196ec9ef8218f937b72a201e9c2843867882dfa5be651da50e3836c1
+DIST genpatches-5.13-2.experimental.tar.xz 5416 BLAKE2B 38bba121d747f24f7a861cc288a5c5148a76f963a3801b41812ac7a75490725a7b483d7ea3cae9ede81739698c785f5f8fdc5fe430a761d3ef5952d9e3c30853 SHA512 c9d28367d658148c5c75b40995032851a8260efe50ea9306c6e250e0d205feff7451a59985a02cc0a5bf768e3c57b95616e0390d5d6636d9dcf3c2e079ef8313
+DIST genpatches-5.13-2.extras.tar.xz 3420 BLAKE2B 70f0775b125a8c478271a89e43e1b783499e38dc27bef5ff4010bdbce2d46530fb3981da66dc7c09b05776af7f93ce8c6073b8e42e76e60c2402b7297a5da0bb SHA512 4283e8a9776bf17e6fb652e96dfe18b08c783b5949de2f3e33bbd268fba6ead12c1dee6edcf0d3447714f55a1026822da9f51d17f0c9e0fe886b22ce9c93a07d
 DIST genpatches-5.4-112.base.tar.xz 3278220 BLAKE2B 11c4a33da1081ce777019604d06740368895e74893cb88f4ba6e3988fe3204f2d5a0ffe2204f77aed427ce8decdd77c5ea7dd374e893cbf7ab346b8fb87a918d SHA512 d2c5378076390358ec60346e832a9454f1b61e67c68da4c6652d7d6cfa29223417fd0b95ea526cead86af5692e4e702a0ee5a169a894d04644f95bbbdd7d727e
 DIST genpatches-5.4-112.experimental.tar.xz 18528 BLAKE2B 94a47359c6c95a9775de669f02c14b0f7cbcc93b77aa8cbb20951ebc67d49fdfe1d0df1dc1b9b4431c91f64c96eff5a4d60d5888f75ecafa37e66194c1e61752 SHA512 53ce013556fd289ac5cce25c925877ca02ff9a4555dc3cc644437944f56bfd45358021f78e234276e2ac5e3725e22b336ae4ffc45acfab3c05c53ba82ddd573f
 DIST genpatches-5.4-112.extras.tar.xz 1768 BLAKE2B 7f77e833bc17035063b98d89135455fe6200eda135a92221c0f2eef63c6b41235653a8d11a7c99e542010c2195c1af8f5ae84a7da27d159fef67be5192537722 SHA512 6dda1c917736f8a45b1d79e3d7f30b243f922b274425975f520d1d2a5a0fb95b0ab242e0f24bd3a5e0b09e8eac76b6f71eab94cbe1747e3162ce85d892a6da5c
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.13.0-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.0-r1.ebuild
new file mode 100644
index 000000000000..73aa5ecc4bdb
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.13.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="2"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index a36c26552a37..663c1f57238b 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -6,6 +6,7 @@ DIST gentoo-headers-4.9-1.tar.xz 5416 BLAKE2B 2538870b340d4e4b260ada37b0571ba770
 DIST gentoo-headers-5.10-1.tar.xz 4304 BLAKE2B b5006ff13c8ef8394806919d547f1b15ac32cc4d290e8c5f5a5073f54112db194a9e743177ae54941d8a504e15b662751258259183c47c574936744d7c51b405 SHA512 3154558df20e3a8821af23b2a585eaccb6c40877850b1cf752c435c170f7f322a48e77cee63bcc061b69aff8602987f4506d803c73f394929716295aface4f3d
 DIST gentoo-headers-5.11-1.tar.xz 3624 BLAKE2B 378eed88876a911e47ea08563f4fea840bfc11def916bce47c3268029ba926ced06e621edb53c9248fed4de547cfb447cc25da2222a864983a746fec06fb60d9 SHA512 896cacd48e9965ea724c13ca5a69b8c9aa4f47e631b539c71e4936462d50da3d34863e7419217ba434bcd97ebf8b05d2fc65bc9e60a584a108e864f4cf7f02fc
 DIST gentoo-headers-5.12-1.tar.xz 3624 BLAKE2B 71206e81c9df3c26b93384231094f2e7762cc3b957261a18999b4e3c782ca3edd2ba25461dcb308b938f515495aabbf5d34234f2b9f072fc344a1c8eb1c3a001 SHA512 f15f31116e81114794de8d2ff30e60ff3844a2202837753754b8ee2c2a56dffcfacc6f873d3d67bc313367ad678d00d84410bf6ced0a32cf391e2978d9eaed6a
+DIST gentoo-headers-5.13-1.tar.xz 2164 BLAKE2B bd2a7454111961c29134087801c5bcf88c9d0ff9d066c87ba8e81b9004c89290ebec46508324f2062e52166c0e4f82a1a740a66e48140030ce8adc7f4b4c9ccd SHA512 9f7fc903c7ad5142322e83a15a356acfbddd0b8f67c998dd03d74c57816eca7eb54f4b8b02c31f92bb9cf63b3285ff98ad9fe09a5fb8f0864a88da2ec80d3da5
 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be
 DIST gentoo-headers-5.9-1.tar.xz 4304 BLAKE2B 5dda91dac529cf3afca220d0ec323f679eae00e850e127ca6fb7dd42313afe7d4e2b23860a5b58673c070456e1ebd6b0d48efd681a764eef1bab996de579fd11 SHA512 3522d25e4d13f703e69a7e8da1813b38c8977821363b56af1988d78c446087dea4c3499283a2fdef2dc000fde29b945abb821a01f53ac0ac6c2b551699b3b18c
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
@@ -16,5 +17,6 @@ DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade7
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
+DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
diff --git a/sys-kernel/linux-headers/linux-headers-5.13.ebuild b/sys-kernel/linux-headers/linux-headers-5.13.ebuild
new file mode 100644
index 000000000000..115b2f8d5927
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.13.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+inherit kernel-2 toolchain-funcs
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="1"
+SRC_URI="
+	${KERNEL_URI}
+	${PATCH_VER:+https://dev.gentoo.org/~soap/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/linux-${PV}"
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+	# avoid kernel-2_src_unpack
+	default
+}
+
+src_prepare() {
+	# avoid kernel-2_src_prepare
+	default
+}
+
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 2aebc10f455d..79cd087073d8 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 466ea2685329..452ffedd6522 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,5 +1,5 @@
-DIST llvm-gentoo-patchset-10.0.1-2.tar.xz 9016 BLAKE2B 50cebbc89f962e741111d0cd6ed108c0ad1bd4f3c83d27be592af7607c8cff953be7ad797ba03dc9fae403c39a2dd1dc942a84be064c2a574a0e234ac0e5593d SHA512 d610dde051e1e797f02ce7c0543187cf850465665fe5c51d3b8af8a944478803837dc05abca6636072ca7249a4a3d2884130b3f94c88e56be1aa75c7c5b6c747
-DIST llvm-gentoo-patchset-11.1.0-2.tar.xz 4732 BLAKE2B 5ec43d404e9ba446171f743609717ca658db3e03ea197866569aca180ec733cf3b7a1880ef3e52f9912538f83ca8ddeaf4dccab4622a1e574f5b499745b0be1c SHA512 845ed0defdb3742a814e6b2283788c7c9e6e28eabcd48f9fb5c5a99063514af7c7610415619f4a8b993312866ac7a316a1f1408cd8086bae85db52ec652327b9
+DIST llvm-gentoo-patchset-10.0.1-4.tar.xz 10472 BLAKE2B be17f25c8e1ba102c7653ccd3890be2da18566d051dcc35eeccf738d0cdfd4c98fed1c9e3d8fada0a394acda4568d4579534255e9706912581070d3cbdb2140a SHA512 794cb77c3002b398a2fcd5f845a41f9d075ba5db53d13665c64958ec809a181ef95d054a0850e49066ef1e926e326077f4305e088ee29f30acf9c2e98161be15
+DIST llvm-gentoo-patchset-11.1.0-3.tar.xz 5984 BLAKE2B 89056fb8e82c7a29ae76c643ac631876d51391ffb579324aaf13c7f79e03f6fd8bbcb27d46e57e0f04a702602ebf51c116e82cb092452a1dbc97fb0eb7518f11 SHA512 08aabe8836b62ecfde4e264d567169ba495d5b5915b56aba35ae86992387e534bba6d512fde94056e641abe909b478e47edcbdaa3ee0b94182ecd68c98201441
 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
@@ -7,3 +7,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild
index 1bece33a48df..470a4f5ab834 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-LLVM_PATCHSET=10.0.1-2
+LLVM_PATCHSET=10.0.1-4
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild
index 66eed5f8f3d1..83cbb9c75c10 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-LLVM_PATCHSET=11.1.0-2
+LLVM_PATCHSET=11.1.0-3
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..e96a02172283
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc4.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test elibc_glibc"
+# base targets
+IUSE+=" +libfuzzer +memprof +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 3d502aefa02e..2170cd123570 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,3 +7,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.1_rc4.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..caf0b9268efd
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.1_rc4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 3d502aefa02e..2170cd123570 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,3 +7,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-libs/libcxx/libcxx-12.0.1_rc4.ebuild b/sys-libs/libcxx/libcxx-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..861d92b62c20
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-12.0.1_rc4.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		>=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+DOCS=( CREDITS.TXT )
+
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
+		# clang-based darwin prefix disables libunwind useflag during
+		# bootstrap, because libunwind is not in the prefix yet.
+		# override the default, though, because clang based libcxx
+		# should never use gcc_s on Darwin.
+		want_gcc_s=OFF
+		# compiler_rt is not available in EPREFIX during bootstrap,
+		# so we cannot link to it yet anyway, so keep the defaults
+		# of want_compiler_rt=OFF and extra_libs=()
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1_rc4.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..8c24d9691115
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-libs/libomp/libomp-12.0.1_rc4.ebuild b/sys-libs/libomp/libomp-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..0fd7afe0ff42
--- /dev/null
+++ b/sys-libs/libomp/libomp-12.0.1_rc4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+LLVM_COMPONENTS=( openmp llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 50f195a03b4c..8c0855d8d8fd 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -3,3 +3,4 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1_rc4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1_rc4.ebuild
new file mode 100644
index 000000000000..4f13111b557a
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1_rc4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules )
+LLVM_TEST_COMPONENTS=( libcxxabi )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local use_compiler_rt=OFF
+	local libdir=$(get_libdir)
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	if tc-is-clang; then
+		local compiler-rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+		   ${LD_FLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			use_compiler_rt=ON
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+build_libcxxabi() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	build_libcxxabi
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 7723d54866c9..abfca7420e20 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/numactl/files/numactl-2.0.14-latomic.patch b/sys-process/numactl/files/numactl-2.0.14-latomic.patch
new file mode 100644
index 000000000000..61655f409967
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.14-latomic.patch
@@ -0,0 +1,50 @@
+From e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 6 May 2021 23:08:36 +0200
+Subject: [PATCH] link with -latomic if needed
+
+numactl unconditionally uses __atomic_fetch_and but some architectures
+(e.g. sparc) needs to link with -latomic to be able to use it. So check
+if -latomic is needed and update numa.pc accordingly
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ Makefile.am  | 1 +
+ configure.ac | 2 ++
+ numa.pc.in   | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 44d0d76..34f6815 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -151,6 +151,7 @@ SED_PROCESS = \
+         -e 's,@exec_prefix\@,$(exec_prefix),g' \
+         -e 's,@libdir\@,$(libdir),g' \
+         -e 's,@includedir\@,$(includedir),g' \
++        -e 's,@LIBS\@,$(LIBS),g' \
+         < $< > $@ || rm $@
+ 
+ %.pc: %.pc.in Makefile
+diff --git a/configure.ac b/configure.ac
+index 659a765..e3b0eb3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,8 @@ AM_CONDITIONAL([HAVE_TREE_VECTORIZE], [test x"${tree_vectorize}" = x"true"])
+ 
+ AC_CONFIG_FILES([Makefile])
+ 
++AC_SEARCH_LIBS([__atomic_fetch_and_1], [atomic])
++
+ # GCC tries to be "helpful" and only issue a warning for unrecognized
+ # attributes.  So we compile the test with Werror, so that if the
+ # attribute is not recognized the compilation fails
+diff --git a/numa.pc.in b/numa.pc.in
+index 8a0f202..cc04d50 100644
+--- a/numa.pc.in
++++ b/numa.pc.in
+@@ -8,3 +8,4 @@ Description: NUMA policy library
+ Version: @VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lnuma
++Libs.Private: @LIBS@
diff --git a/sys-process/numactl/numactl-2.0.14.ebuild b/sys-process/numactl/numactl-2.0.14.ebuild
index 05dee9031d24..e6f89bb776d1 100644
--- a/sys-process/numactl/numactl-2.0.14.ebuild
+++ b/sys-process/numactl/numactl-2.0.14.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
 	# ARM lacks the __NR_migrate_pages syscall.
-	KEYWORDS="~alpha amd64 -arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 -arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2"
@@ -21,6 +21,7 @@ SLOT="0"
 IUSE="static-libs"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.14-latomic.patch
 	"${FILESDIR}"/${PN}-2.0.14-numademo-cflags.patch #540856
 )
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9d7a7d3cbd5d..46acb9ad396c 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/mpi/mpi-2.0-r5.ebuild b/virtual/mpi/mpi-2.0-r5.ebuild
index 6e89702a0713..25670effcc3f 100644
--- a/virtual/mpi/mpi-2.0-r5.ebuild
+++ b/virtual/mpi/mpi-2.0-r5.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for Message Passing Interface (MPI) v2.0 implementation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxx fortran romio threads"
 
 RDEPEND="|| (
diff --git a/virtual/mta/mta-1-r2.ebuild b/virtual/mta/mta-1-r2.ebuild
index ae1815865b6c..09a0c835bb9d 100644
--- a/virtual/mta/mta-1-r2.ebuild
+++ b/virtual/mta/mta-1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for Message Transfer Agents"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (	mail-mta/nullmailer
 				mail-mta/msmtp[mta]
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2329786235fe..1f07ca40807e 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
index 890743ae7e0e..3d7195bd09f8 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	MY_PN="icingaweb2-module-director"
 	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
index 507832c1b08c..82bd6e6ed2cd 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 945ba7794403..302cc724ebff 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/links/links-2.23.ebuild b/www-client/links/links-2.23.ebuild
index 78173bd1d1d7..ee90982eb08e 100644
--- a/www-client/links/links-2.23.ebuild
+++ b/www-client/links/links-2.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 667ee03c0a76..d9da583c7bc8 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,4 @@
-DIST opera-developer_78.0.4079.0_amd64.deb 75593860 BLAKE2B 2e3ac010e6963411c662e9766a4d44490404521c2e211d959d96c78335628ad832e709e3358ec9374c0c9cd6e6bc11822644d0f374ba160df66b015c41c1d690 SHA512 5e9044c1755895a5c5a8acb8ced92eee2d6047714f7faa4b163cd23b9fba4414586f058d1e165945ee150106c30ec0a6662c4124e2f76dd910f2f67576894166
 DIST opera-developer_78.0.4093.0_amd64.deb 75190012 BLAKE2B 342eebc815364866eb93dbe231b7a24a09f130809de8266c0ec0d9808aa2e433200fa4cf51d823564020e56973d831c10fe54e72a8f34822be4eb917145b83ec SHA512 e470122a7490c9009a28469b21108cafba232ef040027e8faea190551a97b1dfe60a7e2caa092d6d4459cf67b3cb22aa5d0da73384fb4528c24a6d925f840691
 DIST opera-developer_79.0.4100.0_amd64.deb 76878004 BLAKE2B 285aa5b687280a0d76e06ce40d7ae3b20e172e3b8a1d8da7b66b4f029dc203581cca7e4b336373bb3d78a5cb66ca50ae38a535770225f75197cf4ebdf4248ea5 SHA512 346ad075121e114d3efd96e8b4dca5f5e502c71dc9bd25ed6c5699e5b8a2d100e74b6bfad3d2bc7ba482025856c155f88c85f5a0ec6ad50dcdecde6d6238d1f5
-DIST opera-ffmpeg-codecs-92.0.4484.7.tar.xz 1384356 BLAKE2B 6032d1f1641e5c5e83ea2315e3774b97a1aa2c5740095d5716b3d6b31ac31d4315a32195273ac5a944578b8c28128802d21e226393f60bdcf6c3a6e73e9b91de SHA512 b152d0a19151b51a1eb9c28946ca7cbb9e6b389fd440554853de0e7c8cf149e805214b051aca9c579988ec1000368208a42afe88cdd47b6290c5da3d5122d1f0
+DIST opera-developer_79.0.4105.0_amd64.deb 78242532 BLAKE2B 8034f10c0eb04d50367bd929bcb1d7ef8ef432ac15f3f8ce5c03a1c456814d0db89b2411e1d92703951d2a545f454329d7121a9b52d10931e4115e9fac9fa2e7 SHA512 9852c04e6659f63f6602a34b466fa4af1fc9ef11f654f3f3db348c27d9964387eb550cdbf40f718452e741e57beba76ca7511f0f36c45f0e8c6fc81b3719690d
 DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
diff --git a/www-client/opera-developer/opera-developer-78.0.4079.0.ebuild b/www-client/opera-developer/opera-developer-79.0.4105.0.ebuild
similarity index 99%
rename from www-client/opera-developer/opera-developer-78.0.4079.0.ebuild
rename to www-client/opera-developer/opera-developer-79.0.4105.0.ebuild
index 9d5d1cbbfdab..5f5790fcf46c 100644
--- a/www-client/opera-developer/opera-developer-78.0.4079.0.ebuild
+++ b/www-client/opera-developer/opera-developer-79.0.4105.0.ebuild
@@ -30,7 +30,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="92.0.4484.7"
+FFMPEG_VERSION="92.0.4515.20"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	proprietary-codecs? (
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 8d1e3430d252..bafcbd7fed13 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a16ae46662aa..81d78c28d0f8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,9 +1,11 @@
 DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
 DIST apache-tomcat-10.0.7-src.tar.gz 6001147 BLAKE2B f1aee4748d404d02188369603824dcc97765e907cfc3872f54b1859ae950a9475d72862caa2179ac39e4cbdb8c23424f89c4cbbfff8a2e079a842b0054257009 SHA512 395b0280666c6779f6378cb87e9abdb637a823e7f89452b7324329f4c0a1fe0b315275dca5df2f80a38c6f1ef98541bd1ea762df7af9cb15e4466c3b89e4e7a8
+DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
+DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
diff --git a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
new file mode 100644
index 000000000000..13e82c9c6517
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
@@ -0,0 +1,40 @@
+diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
+index 10d80e0..34ff7e0 100644
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -306,11 +306,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+             } else if(opt.equals("13")) {
+                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13);
+             } else if(opt.equals("14")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14);
++                settings.put(CompilerOptions.OPTION_Source, "14");
+             } else if(opt.equals("15")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
++                settings.put(CompilerOptions.OPTION_Source, "15");
+             } else if(opt.equals("16")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
++                settings.put(CompilerOptions.OPTION_Source, "16");
+             } else if(opt.equals("17")) {
+                 // Constant not available in latest ECJ version shipped with
+                 // Tomcat. May be supported in a snapshot build.
+@@ -366,14 +366,14 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13);
+                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13);
+             } else if(opt.equals("14")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14);
++                settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
++                settings.put(CompilerOptions.OPTION_Compliance, "14");
+             } else if(opt.equals("15")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
++                settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
++                settings.put(CompilerOptions.OPTION_Compliance, "15");
+             } else if(opt.equals("16")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
++                settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
++                settings.put(CompilerOptions.OPTION_Compliance, "16");
+             } else if(opt.equals("17")) {
+                 // Constant not available in latest ECJ version shipped with
+                 // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/tomcat-10.0.8.ebuild b/www-servers/tomcat/tomcat-10.0.8.ebuild
new file mode 100644
index 000000000000..0b16b403fb0f
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.0.8.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/jakartaee-migration:0
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	virtual/jre"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	virtual/jdk:1.8
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/jakarta/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.50.ebuild b/www-servers/tomcat/tomcat-9.0.50.ebuild
new file mode 100644
index 000000000000..8905e0fad241
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.50.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="5.1.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	virtual/jre"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	virtual/jdk:1.8
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3106047d53a8..e4858f31edff 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
index 83051fe89b7f..99fd0aba31d7 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 9185858bfcc3..3f419f2ac86d 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
index c2cfef2372e1..d4aa70bb0903 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild
index 966aeb7336d7..42490158bca2 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 5a303ea92394..a89ec8151fc3 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.2.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.2.ebuild
index 32c636aa74e7..41a4554da0bf 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.2.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="qrcode"
 
 RDEPEND=">=dev-libs/glib-2.42:2=
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.9.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.9.ebuild
index 383013fa3efa..9f7ac236ab09 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.9.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=