diff --git a/Manifest.files.gz b/Manifest.files.gz
index 84759fa43989..89a892d55edf 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 7eecd1cd0f9a..e892198c54e1 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
index d2188b3b440d..d2e36a5eb234 100644
--- a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
+++ b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-admin/logrotate/logrotate-3.18.1.ebuild b/app-admin/logrotate/logrotate-3.18.1.ebuild
index b2eb09fdf233..254aa29f7356 100644
--- a/app-admin/logrotate/logrotate-3.18.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 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 ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND="
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
index b2ea0ce012c8..d048f37aeb6b 100644
--- a/app-admin/verynice/verynice-1.1-r3.ebuild
+++ b/app-admin/verynice/verynice-1.1-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-build.patch
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 27f764952123..028c55a318d1 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
index da611c2559b0..e4916f5f0bc5 100644
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 018fee1e8cf1..445ee6e85ae9 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.12.12-glibc-2.34.patch b/app-benchmarks/stress-ng/files/stress-ng-0.12.12-glibc-2.34.patch
new file mode 100644
index 000000000000..b2f93f21cba6
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.12.12-glibc-2.34.patch
@@ -0,0 +1,101 @@
+From f839de283c44ffe46a2d14bfdf854c145abd8ed6 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Mon, 19 Jul 2021 20:49:34 +0100
+Subject: [PATCH] Detemine minimal stack size via sysconf, then
+ PTHREAD_STACK_MIN then guess
+
+Don't rely on PTHREAD_STACK_MIN being defined, use sysconf, then
+PTHREAD_STACK_MIN if it is defined, then 8K default.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ core-helper.c    | 31 +++++++++++++++++++++++++++++++
+ stress-ng.h      |  1 +
+ stress-pthread.c | 13 ++-----------
+ 3 files changed, 34 insertions(+), 11 deletions(-)
+
+diff --git a/core-helper.c b/core-helper.c
+index 508627f2..97a3b869 100644
+--- a/core-helper.c
++++ b/core-helper.c
+@@ -2494,6 +2494,37 @@ size_t stress_min_sig_stack_size(void)
+ 	return (size_t)sz;
+ }
+ 
++size_t stress_min_pthread_stack_size(void)
++{
++	static long sz = -1, min;
++
++	/* return cached copy */
++	if (sz > 0)
++		return sz;
++
++	min = stress_min_aux_sig_stack_size();
++#if defined(__SC_THREAD_STACK_MIN_VALUE)
++	sz = sysconf(__SC_THREAD_STACK_MIN_VALUE);
++	if (sz > min)
++		min = sz;
++#endif
++#if defined(_SC_THREAD_STACK_MIN_VALUE)
++	sz = sysconf(_SC_THREAD_STACK_MIN_VALUE);
++	if (sz > min)
++		min = sz;
++#endif
++#if defined(PTHREAD_STACK_MIN)
++	if (PTHREAD_STACK_MIN > min)
++		min = PTHREAD_STACK_MIN;
++#endif
++	if (8192 > min)
++		min = 8192;
++
++	sz = min;
++
++	return (size_t)sz;
++}
++
+ /*
+  *  stress_sig_handler_exit()
+  *	signal handler that exits a process via _exit(0) for
+diff --git a/stress-ng.h b/stress-ng.h
+index 8a8b17ae..cd744756 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -4056,6 +4056,7 @@ extern WARN_UNUSED int32_t  stress_get_opt_ionice_class(const char *const str);
+ /* Misc helper funcs */
+ extern WARN_UNUSED size_t stress_sig_stack_size(void);
+ extern WARN_UNUSED size_t stress_min_sig_stack_size(void);
++extern WARN_UNUSED size_t stress_min_pthread_stack_size(void);
+ 
+ #define STRESS_SIGSTKSZ		(stress_sig_stack_size())
+ #define STRESS_MINSIGSTKSZ	(stress_min_sig_stack_size())
+diff --git a/stress-pthread.c b/stress-pthread.c
+index 0da3aeec..27777af8 100644
+--- a/stress-pthread.c
++++ b/stress-pthread.c
+@@ -69,12 +69,7 @@ static const stress_opt_set_func_t opt_set_funcs[] = {
+ 
+ #if defined(HAVE_LIB_PTHREAD)
+ 
+-/* Some systems such as GNU/HURD don't define PTHREAD_STACK_MIN */
+-#if !defined(PTHREAD_STACK_MIN)
+-#define PTHREAD_STACK_MIN		(16 * KB)
+-#endif
+-
+-#define DEFAULT_STACK_MIN		(16 * KB)
++#define DEFAULT_STACK_MIN		(8 * KB)
+ 
+ #if defined(HAVE_GET_ROBUST_LIST) &&	\
+     defined(HAVE_LINUX_FUTEX_H)
+@@ -404,11 +399,7 @@ static int stress_pthread(const stress_args_t *args)
+ 	stress_pthread_args_t pargs = { args, NULL, 0 };
+ 	sigset_t set;
+ #if defined(HAVE_PTHREAD_ATTR_SETSTACK)
+-#if DEFAULT_STACK_MIN == PTHREAD_STACK_MIN
+-	const size_t stack_size = PTHREAD_STACK_MIN;
+-#else
+-	const size_t stack_size = STRESS_MAXIMUM(DEFAULT_STACK_MIN, PTHREAD_STACK_MIN);
+-#endif
++	const size_t stack_size = STRESS_MAXIMUM(DEFAULT_STACK_MIN, stress_min_pthread_stack_size());
+ #endif
+ 
+ 	keep_running_flag = true;
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild
index 309cd350a1c7..4269478b747b 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild
@@ -28,6 +28,8 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
+PATCHES=( "${FILESDIR}/${PN}-0.12.12-glibc-2.34.patch" )
+
 src_compile() {
 	export MAN_COMPRESS=0
 	export VERBOSE=1
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 81ef4c25deb9..57975e8a0952 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/iat/iat-0.1.7-r1.ebuild b/app-cdr/iat/iat-0.1.7-r1.ebuild
index 1db342f25705..9fea3a8127c2 100644
--- a/app-cdr/iat/iat-0.1.7-r1.ebuild
+++ b/app-cdr/iat/iat-0.1.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="BIN, MDF, PDI, CDI, NRG, and B5I converters"
 HOMEPAGE="https://www.berlios.de/software/iso9660-analyzer-tool"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 75c542642182..6b63c206e5c0 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/mg/mg-20210314.ebuild b/app-editors/mg/mg-20210314.ebuild
index a25f7051f9bf..10f44d583185 100644
--- a/app-editors/mg/mg-20210314.ebuild
+++ b/app-editors/mg/mg-20210314.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8ae81876f4bd..cc155c333848 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 99e74a98cf17..090fef9f9e6c 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,5 +1,2 @@
-DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
 DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22 SHA512 3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b
-DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
-DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84
diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild b/app-emulation/containerd/containerd-1.4.6.ebuild
deleted file mode 100644
index 8e9b81b35d7d..000000000000
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CONTAINERD_COMMIT=d71fcd7d8303cbf684402823e425e9dd2e99285d
-EGO_PN="github.com/containerd/${PN}"
-inherit golang-vcs-snapshot toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-emulation/runc-1.0.0_rc95
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
-		-e "s/-s -w//" \
-		Makefile || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-	)
-
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	export GOFLAGS="-v -x -mod=vendor"
-	# race condition in man target https://bugs.gentoo.org/765100
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( README.md PLUGINS.md docs/. )
-	einstalldocs
-}
diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild b/app-emulation/containerd/containerd-1.5.2.ebuild
deleted file mode 100644
index 7ebc5b203744..000000000000
--- a/app-emulation/containerd/containerd-1.5.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${PN}-man-${PV}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-emulation/runc-1.0.0_rc95
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-	default
-	mv ../man . || die
-	sed -i \
-		-e "s/-s -w//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		GO_BUILD_FLAGS="-mod vendor"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION=36cc874494a56a253cd181a1a685b44b58a2e34a
-		VERSION=v${PV}
-	)
-
-	emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index dec811716bc3..256eca2cc2a1 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,2 +1 @@
 DIST runc-1.0.0.tar.gz 2366170 BLAKE2B 1b6455cd45bc51b92c12b3293037446da62957d441124e9b76fd44ce92329e0eb2fde2ef71c6519fc4d58bcbd4ef580f64d71753a6fc06f3f6e347de170bd9c3 SHA512 8ddad1e031237c07b6cab5cfe5bdb7b11bf98d5d1064ec06845f36da073fe65a0facc6a28ba5daff71cdcb50cfd5d1cd25e97385b4eddb35b287113c2771365c
-DIST runc-1.0.0_rc95.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
diff --git a/app-emulation/runc/runc-1.0.0_rc95.ebuild b/app-emulation/runc/runc-1.0.0_rc95.ebuild
deleted file mode 100644
index 2fc5c14728ea..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc95.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=ff819c7e9184c13b7c2607fe6c30ae19403a7aff
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-IUSE="apparmor hardened +kmem +seccomp test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-emulation/wine-staging/wine-staging-6.10.ebuild b/app-emulation/wine-staging/wine-staging-6.10.ebuild
index 5fa927046960..b8f90b4648c5 100644
--- a/app-emulation/wine-staging/wine-staging-6.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.10.ebuild
@@ -572,7 +572,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-staging/wine-staging-6.11.ebuild b/app-emulation/wine-staging/wine-staging-6.11.ebuild
index 5fa927046960..b8f90b4648c5 100644
--- a/app-emulation/wine-staging/wine-staging-6.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.11.ebuild
@@ -572,7 +572,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild
index a2848d52589b..5ee92b570653 100644
--- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild
@@ -572,7 +572,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-staging/wine-staging-6.13.ebuild b/app-emulation/wine-staging/wine-staging-6.13.ebuild
index 7285c2bf12d9..041f41f217b0 100644
--- a/app-emulation/wine-staging/wine-staging-6.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.13.ebuild
@@ -572,7 +572,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 97f1f4176260..12f275eb2297 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -571,7 +571,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
index c5a63d2e32eb..2cc3f397034b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
@@ -493,7 +493,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
index 9eadda966bb1..5d9107ff7aab 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
@@ -493,7 +493,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
index b16b5176cce9..834f66e2ec07 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
@@ -492,7 +492,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild
index b16b5176cce9..834f66e2ec07 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild
@@ -492,7 +492,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
index e725ccf27b97..abcc1fe86364 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
@@ -493,7 +493,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild
index e725ccf27b97..abcc1fe86364 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild
@@ -493,7 +493,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index b16b5176cce9..834f66e2ec07 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -492,7 +492,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 53bbe3252e9d..dfa32f5ce3e9 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild
index 23766aa1a573..c47b047c074e 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
 
 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
 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=""
 
 RDEPEND="virtual/man"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3ff0464519d6..545f88d70dc9 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/pax-utils/pax-utils-1.3.2.ebuild b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
index f2ba5374553b..857da2508958 100644
--- a/app-misc/pax-utils/pax-utils-1.3.2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/rpick/rpick-0.8.4.ebuild b/app-misc/rpick/rpick-0.8.4.ebuild
index ff055e6b0320..4838740211cb 100644
--- a/app-misc/rpick/rpick-0.8.4.ebuild
+++ b/app-misc/rpick/rpick-0.8.4.ebuild
@@ -121,7 +121,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8755459924a2..ee243ed485ad 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
index 5f654e5053fe..072c9c1ef29f 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-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"
+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"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index 5643b6089563..6a6e7f94de22 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 SLOT="0"
-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"
+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="unicode"
 RESTRICT="test" #411523
 
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index ea7133bfdb70..976f1956e486 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
index 133ba4d2cde9..f75dfc862437 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1,2 +1 @@
 DIST integer-logarithms-1.0.3.1.tar.gz 9023 BLAKE2B 29a9e2e73a6fb63f31ad87b53161b9f669a3cf6fed2992d7bf7414d9c9cff9cbe00baa301f7a7889fc0a31ff635d85dafc49ed5ce3f009202ba017b47e75c8a0 SHA512 670aff419de8d6afd1b7e1a40b68290bcf7aefad788c3b08aebfa5ca3e709f5d22543fce82fb75dc18b3ba0ef6d8a8f61735cde647a7a6c9392a60ec365534b3
-DIST integer-logarithms-1.0.3.tar.gz 8840 BLAKE2B d59a01c2b712c499ee5c81da0d8055d96137f5a1c55ccc5a77ca99449743b753223949de2a0289965423ae16bb61eef7452ace736cc5a0d6448d7f1ab8318fed SHA512 b211127620bb52398ae7e64281f991d9dd016d5f74ff5d939275afea15689b01f82577efeaa2dfcdf4230cfea841f6c14f731ba16d38192f48e2e7ae90e704f3
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
deleted file mode 100644
index baf54225bac4..000000000000
--- a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -check-bounds,+integer-gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Integer logarithms"
-HOMEPAGE="https://github.com/Bodigrim/integer-logarithms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3 && < 4.13' 'base >= 4.3' \
-		'ghc-prim < 0.6' 'ghc-prim'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check-bounds \
-		--flag=integer-gmp
-}
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
index c4dab9cf9893..8dbbfe09f058 100644
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
+++ b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-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=7
@@ -20,7 +20,7 @@ IUSE=""
 RESTRICT=test # two tests require network access
 
 RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
+	>=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?]
 	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 "
diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
index 7a38bb900964..b7878815d80d 100644
--- a/dev-haskell/parser-combinators/metadata.xml
+++ b/dev-haskell/parser-combinators/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index 97b788ac85df..c1f941bd8464 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -5,38 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides a wide array of semigroupoids and operations for working with semigroupds.
-
-		A Semigroupoid is a Category without the requirement of identity arrows for every object in the category.
-
-		When working with comonads you often have the @\&lt;*\&gt;@ portion of an @Applicative@, but
-		not the @pure@. This was captured in Uustalu and Vene's \"Essence of Dataflow Programming\"
-		in the form of the @ComonadZip@ class in the days before @Applicative@. Apply provides a weaker invariant, but for the comonads used for data flow programming (found in the streams package), this invariant is preserved. Applicative function composition forms a semigroupoid.
-
-		Similarly many structures are nearly a comonad, but not quite, for instance lists provide a reasonable 'extend' operation in the form of 'tails', but do not always contain a value.
-
-
-		Ideally the following relationships would hold:
-
-		&gt; Traversable &lt;---- Foldable &lt;--- Functor ------&gt; Alt ---------&gt; Plus           Semigroupoid
-		&gt;      |               |            |                              |                  |
-		&gt;      v               v            v                              v                  v
-		&gt; Traversable1 &lt;--- Foldable1     Apply --------&gt; Applicative -&gt; Alternative      Category
-		&gt;                                   |               |              |                  |
-		&gt;                                   v               v              v                  v
-		&gt;                                 Bind ---------&gt; Monad -------&gt; MonadPlus          Arrow
-		&gt;
-
-		Apply, Bind, and Extract give rise the Static, Kleisli and Cokleisli semigroupoids respectively.
-
-		This lets us remove many of the restrictions from various monad transformers
-		as in many cases the binding operation or @\&lt;*\&gt;@ operation does not require them.
-
-		Finally, to work with these weaker structures it is beneficial to have containers
-		that can provide stronger guarantees about their contents, so versions of 'Traversable'
-		and 'Foldable' that can be folded with just a 'Semigroup' are added.
-	</longdescription>
 	<use>
 		<flag name="comonad">
 			You can disable the use of the `comonad` package using
@@ -44,11 +12,6 @@
 			useful for accelerating builds in sandboxes for expert users. If disabled we
 			will not supply instances of `Comonad`
 		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
 		<flag name="contravariant">
 			You can disable the use of the `contravariant`
 			package using `-f-contravariant`. Disabling this is an unsupported
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
index 9ac5ac13aff1..f213497d45cc 100644
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # ebuild generated by hackport 0.6.1.9999
-#hackport: flags: +doctests
+#hackport: flags: +doctests,+containers
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -16,13 +16,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive +tagged +unordered-containers"
+IUSE="+comonad +contravariant +distributive +tagged +unordered-containers"
 
 RESTRICT=test # broken on USE=doc
 
 RDEPEND=">=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
 	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] )
@@ -41,7 +40,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
+		--flag=containers \
 		$(cabal_flag contravariant contravariant) \
 		$(cabal_flag distributive distributive) \
 		--flag=doctests \
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 102ead147ed2..3a72af74063c 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 35d7bee2b779..849c4a41d3b2 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,17 +1,34 @@
 DIST openjdk-11.0.11_p9.tar.bz2 95298760 BLAKE2B 7572d297fecffa9d38998c79dda00ea9361c1cf2f6c8bf51bac782da17cd3b6b272d08ab57fff96d523a1299f5514cb3788d05eeb37ef467ee7ad8bbb156d98e SHA512 72deecf32b793fa331deb6a1c0294b1efc68b72af9aebc1ba0528189e0097ff6d226cd0c3947d3cdc35c3cf28b3450cc538d375be0b9d43dca379f244894d20e
+DIST openjdk-11.0.12_p7.tar.bz2 95201432 BLAKE2B 6a031fec8e49025dd07d970bc12ef4da23c0e6be8a7b6f6609154bbe607de386669e58c529a935504a4a115269cf3e5a142ced50be5b21961b21d6ba53c6ecc2 SHA512 ca2af877839ee91b989981112be0af446d835ddf9eb68fc4976c2f97b21a4b0c9ec67625c202084e92834dd1a75f97a8aeff77a45570a79dc870cf6bd9d5d97f
 DIST openjdk-8.292_p10.tar.bz2 457861 BLAKE2B 043c1d6f7d040dedaadd05091ce4fdf3f516c1cd241e3603c81f2c49fd81df9c4f1082822a5471255381d56f3ab838a24e499b4ec647f3354ee051078c496b2c SHA512 6e1ac380db32fa5f1decc80291dcdb5e1d3d9afb0dc4587966c5a1b840588a984bc07109c23cb0c69c60509c6db8152e7306509280063f7d2e853aed41e391cc
+DIST openjdk-8.302_p08.tar.bz2 459824 BLAKE2B 19909605f3ae93f94875268e88b8fea0a49be0d8adbf2d2369c5fa1e66f6880094730294cb52bad009984c7ac7f63b8271fa43d0901fe4ce52b7b03696aaa6e3 SHA512 2be9c2965e307b09dcd07225e09665bbc818ba851d9e854645218194f0052eb4736f49915fddebb2a89043b0c14d7a6d5de145fb712034661568610e596fe0e5
 DIST openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 464164 BLAKE2B 3f50f20517ef7b4599f9062330b3bc86900c137751e65d3047d165ad153032447b5f9c88e0d390c0ed758ad10d818295ce2cde04150da5036dd6b05fa26c2745 SHA512 074e9ea2fe83f4edb4d0de72f0d1a9c9091c28707c17b08ffab11cad2620790e740bfe53cef41a07d04b31cc32c1388e52e09eb07ca0b9929300d611c514619e
+DIST openjdk-aarch64-shenandoah-8.302_p08.tar.bz2 466591 BLAKE2B 3ef3939a2ed30c628d92319b2ef68472e53b47752faa331728966432c8469138b61e634e021aa5f69eef608e951cee5f0b77c1de6f3768cf568900f2eb78c5be SHA512 deb126036fecdc9a65b8a203ba32f99a2114cbcba2680950963d3e87565277e14ac53d802278e1f27c2a73be02d0ef77549de4ecd9ee355b1c8e45a86c83b095
 DIST openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 1052188 BLAKE2B b4acda6a4d97cdfb4cfe16e1442dac6989af5fec82143dabb914ee31632b5421bc091708b06e37f95d552b21dbf24ed681b026635e96d32f05ac7d964eb53ac0 SHA512 9f4cfdf8a2580414f90ce0b128fd2ebbeb46977994605d3182ee5033be92898f3b292bafe6c0ca3a0fc767c03de598c93e25cbbc06726383b35961d40c601cee
+DIST openjdk-aarch64-shenandoah-corba-8.302_p08.tar.bz2 1053085 BLAKE2B 02296f31b6ad8f72e89baf669c47d59a71ff02dcb87efac020b3dd443b033e8e9e4faa831a08922db5fc5f07872233e3314bd416eb97d7946110d89fa2cc9f87 SHA512 11f3413ec44b3cd7d543464b1757fa041798861e3b323641b26abe5edd3ba8edaacb6a5fd26d5b9f27d60cbb38983c6fd55ba80c13ff7ec09839d2c340f305bb
 DIST openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 8787501 BLAKE2B 628c84ad165e82b782a66c159ea2bfc2e739eafa41981d353272911bce3338b8eedeb204bf5c8238270ef22259c215301dbf30bcbcc366bbb1c1ed05c6bcf0fc SHA512 50a97c8bbf225c7b2dae50d398eb17831ad761fafb210a481942101bac54164604c76353ca4f0ec7c3a601039eb80164afdfc62f509c0b87e9c948970c0e6140
+DIST openjdk-aarch64-shenandoah-hotspot-8.302_p08.tar.bz2 8790278 BLAKE2B 4dfc70455f680f683c51620acc4624f2301b4304ff5e56783665a00b0366a67612b0219f45fd97021f7e6c396ffcd60355bc642e2cb4fd87c9f93443f72df9de SHA512 68473f17aeb4bdac87385ae33f8c241003b8dde51200633a1cc7f7f92e2ed92151c49ad023427970d855d52f35615709f0076b1cf073a00961f320b825ecbf78
 DIST openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 2726660 BLAKE2B dc720b115212084ab59a4af6b257b485592a84e630650445ed3bdc0c471d529bdc8a1f2b73c5e38fbdd65ff1c221309e814adbba851c59279c8b3740b4560d90 SHA512 43c0e6327c3f7ff2d6320e7d1504f1575c0993c53a207dcabc75a0e1785fcca2aac7f78856db374198e3e95bce4bb05520a9a4e94f2ec03446b28f4d65cd69b6
+DIST openjdk-aarch64-shenandoah-jaxp-8.302_p08.tar.bz2 2726090 BLAKE2B b15a940dc1832f9c5536da5b0f024a091e62500eed7300075e7e8b21491cbe67a4e56f0cbb0e247e288b766619212f34e5cbb4265bb7688f44dc85f6d666c622 SHA512 e77d10caa9e2844470e01512a78cfce10c4d93c1d0597e405fa7233d5b402bb5c015045770fc2f338d24d98c978d23bfa7c6c0edc65f8bb48233c3a5a846e3e9
 DIST openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 2560138 BLAKE2B 6e40ca6fd363c6ef9500b6b40c7f6c836b496899d289d0626f0e52412924498eb6b000291b58af8d42b9bc7dcc2beb1374ef6b8ea18d483841568d3848230842 SHA512 0ffbe33f375f18679797a7e724b621015650a6a9374ff231814f8e8ad0eafe42f281f76a83e87e234604c266ccbc15bd6e84692c3d7e272e702be316ce0048b2
+DIST openjdk-aarch64-shenandoah-jaxws-8.302_p08.tar.bz2 2560243 BLAKE2B 9a548756d609df495f77b2fe79884698d73e6c18254507c31b3364693eabf91d3a31153e182efeef4f5c2d505d509e01bebbe19afdce9d5294678c38a4791111 SHA512 b9bbe9ca06336daf8e10c60de1bdd209d8d561baed4d0ec77e419280d50b34f5297291a442568b0bba366fd39c6e8ac5a10fb9a19644fd584632456be618be6e
 DIST openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 48705934 BLAKE2B ab8995ef30267d635f670791417124ce63435f4cde095c057e4b506cbc23b879bf308986ea0960392836acd46aa6fd7be9a09fea011a85c981388ad58a876f0a SHA512 7f76a8e81cf759989657101a4b71ae0e896273571e5d61790100e412dc1c211118251b6f068da3764ff1059635f98079d88c6cdddf04f676c5db3a665d3d9d8b
+DIST openjdk-aarch64-shenandoah-jdk-8.302_p08.tar.bz2 48780613 BLAKE2B fdf5c10e57ae153728c560de643e1a73070ba72a97e72ea94f66e8e69bd7602b7b821bc8240fa09b0fa16a563a4c7083e386989f947f2027b966e6b859dc6491 SHA512 ed7e884daa9899224c75577d6a86e0f431314d561e2afb244b7cd208f9e5614a4cc80578e7e14d803b4096b1bfca5d3929abec63e201c13f28de2fe6cef59398
 DIST openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 2402059 BLAKE2B 707654793fa26f2a992c2ded6130d5710efac6a91661914bde150a91720fcf08a54931fcd1a56fbc31dc1a61a5216b61e3871d963a2b03803ae8cbcfa8b095ab SHA512 6dc82a18edeb5390d078a3113d2f7c7510737b9a9761b1a714d855d36afe4530b41a6e980af0bb090b31e8f95f67e097190d656d265c8518f3971526ee5e4001
+DIST openjdk-aarch64-shenandoah-langtools-8.302_p08.tar.bz2 2403538 BLAKE2B a26e79353637e0f3c431dbd5edc9ce959f9f60057af76d3b24c09ac623f2f3272de5fd5d2ffc3153247f1f76d339ab4ad62a87864d70ca64881dc5d177e6c96e SHA512 97c5a039620df40185327bd04865d3a11ea8a419c310f27ae1c4b45cb4f8dbe940c8a08bb9903525faaa79d917b009175d4b3827e6cfa0b64e4807b6da3328b2
 DIST openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 2841484 BLAKE2B 4d95d38c6af366fa4be8e9ad2d3cf09d6ad1ac05d25ca94d15200a051cdfcc67af666420a5487f0b2782040dc3483475bf2515b0b5d40e520f162e78f768d5c5 SHA512 523e1292169a6a791c2b90672295cd3210a09b8c973cc038e9ebda7e89afc0339568a993909eb108985998060ccdd13601a9bd9a8e4890ac606febf07578a887
+DIST openjdk-aarch64-shenandoah-nashorn-jdk8.302_p08.tar.bz2 2842578 BLAKE2B 0ce96a05392250116099a23d6ec54117dfdeff3e75a8fecfab6c1350edb0a45b9652befef6d0387579835c3450e61a4409e51d1a471aefcbe5016c3f346df9b4 SHA512 87140f7e451234b916df6948c0f5a59e5c4321939474aba8318076ff76c247414807d51cdc006f6db6d45f71c1b2e7cc1e7e7ada44b7bc446adebbe622af6062
 DIST openjdk-corba-8.292_p10.tar.bz2 1033217 BLAKE2B f6ac60ad0aab0c1ca149fdf2b26648d38ab083ee6fa36b2f82aca19e79037ac7166c43f91c193493923ea4dabd57de3bcccd75a73aeb6439c1d464729afa957b SHA512 7bbc2b61421a81ca2f0e1080bf5c3bd065f737c0dbc822f123875f2675515b947b4f8efbf0ddb3b8d887b90ab5c646fbb12ae35607ff295d9ca489737ff4fac9
+DIST openjdk-corba-8.302_p08.tar.bz2 1033971 BLAKE2B 0e714a7f8344cd5a1a4800b7a3cdc06d1993f97a34bb15af6f259ab4aa36fad883f82aaa16136c5c62fed0716c8d63ec5d6990d2f4b9385906c99ca4c62c286f SHA512 d539e7222df64cee23b071087d2f5fd5467ebf5fbb0c49bda631c735517073e0f7e2b933f8595bb33b2fe5bf3e3064efaaaada41f7538537914678efdae543a7
 DIST openjdk-hotspot-8.292_p10.tar.bz2 8558678 BLAKE2B 02aaa0cef73dc7aa7e9db426fb021d00f25321426438365f672e0fcbec476826d62c92d897b520f0162ab63f2bf72ecdbf6d8e8a7241d455900d427aafa22bb8 SHA512 ae1e174fad6c41f30593abb4c0be17752d6f7de0fa0a1b83c383cb7cd0848e462ca88feb391c9a8427e167c06e6c3d01230fb769f711dcfddd007f8e43d4c481
+DIST openjdk-hotspot-8.302_p08.tar.bz2 8559747 BLAKE2B 0050b7f4fd8a8beafa6e95215c820bb98a3576b6c8620ea5cc8d631a5e1be7f0f2237734b962ed648ddd038cb0abbb571b24ae71ba488816cdf93ba59915e905 SHA512 86bfcf6c2e4e63dc646062da004520e8ad5c146bb7a6aa3ea1a80813f0b05cc972bce9c3e75a2bb73822ddcef1fbaa525f8b43b36da7f62740a70e1c572d1683
 DIST openjdk-jaxp-8.292_p10.tar.bz2 2684063 BLAKE2B 7130d33afb81d83f0ec3afb5e6e161c318e7c6b36189dd7f88410a7edc07a17ebe2d5c15c5991b31d180d4d1c70c683953a9cfcac1c3eded64a4ab679d4a0366 SHA512 92a15a693440cda28aebe9033675aadcbc099a913f9148b26eae90004d54b246152b326e0005b3da6178286ee21f71f12ecd2f395c09b6707679239506154849
+DIST openjdk-jaxp-8.302_p08.tar.bz2 2684910 BLAKE2B 0f6b7066efb2064a8af59c53da182bdf21313389ea933352a7cd8d1ddbabc7286b8558dd0770ac121b74b55ea47107f037603202d2b12582d6ae00a37b6ba567 SHA512 13aafaa978a28a31beb3c25a6d85626dfd91972a1bb43273dcb1b55c6d48cd4fe0f0d1d78aa309792a00885534d767c05a38b7da24b4ba9c7f81eb0702a9025e
 DIST openjdk-jaxws-8.292_p10.tar.bz2 2543680 BLAKE2B f39b7e939de9ba19f9ff53d2748e2fee7acc82bd4d85a4d8e1f49e3b0919daa03c4996e63a46e908da966dbebbf7051955104b291178f9b059d60e8208dce51c SHA512 5106a28819da3708f8a71e4595cb0191099a7d2e06b7190981beea6af504681927be6c07ebcbe77340735bb22c365e1cf001709311c0a57940247d9584a0ee48
+DIST openjdk-jaxws-8.302_p08.tar.bz2 2544355 BLAKE2B 94665442869022a94db1e6ac945b6baa262c055d17c458b936cdfbec1b0cac8cb975f4949c64b7ad39a7c76096e8457a9e6bc752fcb91b2342a18593b7b98521 SHA512 b0a933ee76f0b787d9ca7835e4191812669259d471b4214906e247fcf30ccfeca76ee213bd07ed8263af2a1ecca11df5c2870fe64bfb8c68f838992f64962da0
 DIST openjdk-jdk-8.292_p10.tar.bz2 48746031 BLAKE2B a54a832a305b87cbd4ceda4eb5bcea07e2a3d4b9f5648f21f52b4e29cf6053b830f876591a0c2c1a6447473354bfcf79d70c260c7bb24505743bd3ba67ba2568 SHA512 c10a64086e0fd63f2ecab884b7baa88c3dcdaad83f2240d7fe3d590913af252a57c9d735268acb1e75bda2883c4c41d47f405db0c15f82d833d33d08c824b9d6
+DIST openjdk-jdk-8.302_p08.tar.bz2 48761793 BLAKE2B d27904377719193603f20af54ffaff918f490b09c79eea371edf920c1a254cf8e5520b286be33b7adc035668ffb483bec158c0c7e12b4af6ab8b9436a3aea534 SHA512 bd07b21bbfbb8340f4e08e6ad7a39d68f4e1ec091a39a773ae87a9212b11218b82419f35523ae85300369e704595fbde6da6446625e349801bc07c5d13b46b2f
 DIST openjdk-langtools-8.292_p10.tar.bz2 2401270 BLAKE2B b4043862df04e9f0056d420116e47f4f1515d1e935bfb6830a67a9de3894c94a6289a7952153bef971369cdbdf2374154cd4895950fe49f8a21af5e3316dfa8a SHA512 ba66be7f37ca8268d1dd0b8d4e68c90ae19f815ac3b64aa1f1abf02a722a09ec46c7605d5124ac960bd44335b053da12b36d4b0562b3675ac503fd838d4924d7
+DIST openjdk-langtools-8.302_p08.tar.bz2 2401910 BLAKE2B 64e1d65121bfc75314b0f4205691140ec167f2ee72472650b1558f0a387bad1a657ad51a001c184ae65d8e8a1fd5bbe6f07a96e7e8c41cf13a195e0ba6aaf638 SHA512 517f75fa6e22fca92892d1811914bdcbcd7d85bd5357ac5253a0c3b3551a119d0ec68a82ca99bb336e34c6ff33b82195379c4ae9fb07f10e71f45e9a2ed65d75
 DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
+DIST openjdk-nashorn-8.302_p08.tar.bz2 2848729 BLAKE2B 75cb7e04c0b398f7b5443738b08473a4a806ffbd416828dfa9d7696e11c4ed28337330a4ba19794394689d571a05e6dd95ffbb047482b744cf25ac9551e94100 SHA512 c0634948d4d35271c27009108c322779ee67cdc764c3e49aeaa0bf9e59729486bdaf7f54dcd5289e82fd0e83f03f68a04597d187d37ccb4aa5b2e93f30111a06
diff --git a/dev-java/openjdk/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh
index e85a08ce4a8b..8f863e4c869a 100644
--- a/dev-java/openjdk/files/openjdk-8.env.sh
+++ b/dev-java/openjdk/files/openjdk-8.env.sh
@@ -7,7 +7,7 @@ JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
 JAVAC="\${JAVA_HOME}/bin/javac"
 PATH="\${JAVA_HOME}/bin"
 ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
 MANPATH="\${JAVA_HOME}/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.${SLOT}"
diff --git a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
new file mode 100644
index 000000000000..e6cf8c5cdf7b
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
+MY_PV="${PV%_p*}-ga"
+SLOT="${MY_PV%%[.+]*}"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT}= )
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+	)
+"
+
+REQUIRED_USE="javafx? ( alsa !headless-awt )"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #713180
+	append-flags -fcommon
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype=system
+		--with-giflib=system
+		--with-harfbuzz=system
+		--with-lcms=system
+		--with-libjpeg=system
+		--with-libpng=system
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PVR}"
+		--with-version-pre=""
+		--with-version-string="${PV%_p*}"
+		--with-version-build="${PV#*_p}"
+		--with-zlib=system
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+		$(tc-is-clang && echo "--with-toolchain-type=clang")
+	)
+
+	if use javafx; then
+		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images product-images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break"
+		ewarn "many java ebuilds as they are not ready for openjdk-11"
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+	fi
+}
diff --git a/dev-java/openjdk/openjdk-8.302_p08.ebuild b/dev-java/openjdk/openjdk-8.302_p08.ebuild
new file mode 100644
index 000000000000..e0adcf48d134
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.302_p08.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+# we need latest -ga tag from hg, but want to keep build number as well
+# as _p component of the gentoo version string.
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
+MY_PN_AARCH64="${PN}-aarch64-shenandoah"
+MY_PV_AARCH64="$(ver_rs 1 'u' 2 '-' ${PV/_p/-b})"
+MY_P_AARCH64="${MY_PN_AARCH64/#${PN}-}-jdk${MY_PV_AARCH64}"
+
+BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
+AARCH64_URI="https://hg.${PN}.java.net/aarch64-port/jdk8u-shenandoah"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="
+	!arm64? (
+		${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+		${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
+		${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
+		${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
+		${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
+		${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
+		${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
+		${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
+	)
+	arm64? (
+		${AARCH64_URI}/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-${PV}.tar.bz2
+		${AARCH64_URI}/corba/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-corba-${PV}.tar.bz2
+		${AARCH64_URI}/hotspot/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-hotspot-${PV}.tar.bz2
+		${AARCH64_URI}/jaxp/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxp-${PV}.tar.bz2
+		${AARCH64_URI}/jaxws/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxws-${PV}.tar.bz2
+		${AARCH64_URI}/jdk/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jdk-${PV}.tar.bz2
+		${AARCH64_URI}/langtools/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-langtools-${PV}.tar.bz2
+		${AARCH64_URI}/nashorn/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-nashorn-jdk${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	sys-libs/zlib
+"
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/icedtea-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+		dev-java/icedtea:${SLOT}
+	)
+"
+
+PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
+
+PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	default
+	mv -v "jdk${SLOT}u"* "${P}" || die
+
+	local repo
+	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
+		mv -v "${repo}-"* "${P}/${repo}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# new warnings in new gcc https://bugs.gentoo.org/685426
+	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
+		hotspot/make/linux/makefiles/gcc.make || die
+
+	chmod +x configure || die
+}
+
+src_configure() {
+	# general build info found here:
+	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
+
+	# Work around stack alignment issue, bug #647954.
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #706638
+	append-flags -fcommon
+
+	tc-export_build_env CC CXX PKG_CONFIG STRIP
+
+	local myconf=(
+			--disable-ccache
+			--enable-unlimited-crypto
+			--with-boot-jdk="${JDK_HOME}"
+			--with-extra-cflags="${CFLAGS}"
+			--with-extra-cxxflags="${CXXFLAGS}"
+			--with-extra-ldflags="${LDFLAGS}"
+			--with-giflib=system
+			--with-jtreg=no
+			--with-jobs=1
+			--with-num-cores=1
+			--with-update-version="$(ver_cut 2)"
+			--with-build-number="b$(ver_cut 4)"
+			--with-milestone="fcs" # magic variable that means "release version"
+			--with-vendor-name="Gentoo"
+			--with-vendor-url="https://gentoo.org"
+			--with-vendor-bug-url="https://bugs.gentoo.org"
+			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+			--with-zlib=system
+			--with-native-debug-symbols=$(usex debug internal none)
+			$(usex headless-awt --disable-headful '')
+			$(tc-is-clang && echo "--with-toolchain-type=clang")
+		)
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		CONFIG_SHELL="${EPREFIX}/bin/bash"
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED%/}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	# build system does not remove that
+	if use headless-awt ; then
+		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+		{,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/docs/*
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
index eb33dde54b1d..b008bbac0cd2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 605d416a8603..9544b9bbbfdd 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/python/python-3.9.6.ebuild b/dev-lang/python/python-3.9.6.ebuild
index e24479c5cb4a..7d11097a8091 100644
--- a/dev-lang/python/python-3.9.6.ebuild
+++ b/dev-lang/python/python-3.9.6.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9310595b8afb..fe59b9dea66d 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
index 328bf48a48bf..e5d57b931979 100644
--- a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/ell/ell-0.41.ebuild b/dev-libs/ell/ell-0.41.ebuild
index c8c2e4f5aed8..7e8413947af3 100644
--- a/dev-libs/ell/ell-0.41.ebuild
+++ b/dev-libs/ell/ell-0.41.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/imath/imath-3.0.5-r1.ebuild b/dev-libs/imath/imath-3.0.5-r1.ebuild
index d0e1ef763424..a1bd6fa5cf4c 100644
--- a/dev-libs/imath/imath-3.0.5-r1.ebuild
+++ b/dev-libs/imath/imath-3.0.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords):
 # ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/libpcre/libpcre-8.45.ebuild b/dev-libs/libpcre/libpcre-8.45.ebuild
index 9684a4138453..dfeaebddecd2 100644
--- a/dev-libs/libpcre/libpcre-8.45.ebuild
+++ b/dev-libs/libpcre/libpcre-8.45.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/weston/weston-9.0.0-r1.ebuild b/dev-libs/weston/weston-9.0.0-r1.ebuild
new file mode 100644
index 000000000000..9cccdc2f48f7
--- /dev/null
+++ b/dev-libs/weston/weston-9.0.0-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit meson readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	colord? ( lcms )
+	drm? ( gles2 )
+	pipewire? ( drm )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-protocols-1.18
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	pipewire? ( >=media-video/pipewire-0.2:= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-pipewire-0.3.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		$(meson_use fbdev backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use launch weston-launch)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use colord color-management-colord)
+		$(meson_use systemd launcher-logind)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		-Dtest-gl-renderer=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Fxv devices) || die
+}
+
+src_install() {
+	meson_src_install
+	if use launch && use suid; then
+		chmod u+s "${ED}"/usr/bin/weston-launch || die
+	fi
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 5bc288e98744..8d0a5358b774 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -82,7 +82,7 @@ RDEPEND="
 		x11-libs/libX11
 	)
 	xwayland? (
-		x11-base/xorg-server[wayland]
+		x11-base/xwayland
 		x11-libs/cairo[X,xcb(+)]
 		>=x11-libs/libxcb-1.9
 		x11-libs/libXcursor
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 86f2eee69a49..7048715b9b52 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
index 452d02513530..4ff43c2cb136 100644
--- a/dev-ml/csexp/Manifest
+++ b/dev-ml/csexp/Manifest
@@ -1 +1,2 @@
 DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
+DIST csexp-1.5.1.tbz 10082 BLAKE2B 71d6844d5ae37d64c4b29ed8e2479869bda23bc8b352acc17a83a061acb6bb2dc223e3e9aba444c87949137123a716450a0c665c2c109bd98dcd702931e4a2be SHA512 d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505
diff --git a/dev-ml/csexp/csexp-1.5.1.ebuild b/dev-ml/csexp/csexp-1.5.1.ebuild
new file mode 100644
index 000000000000..471655dd5cf4
--- /dev/null
+++ b/dev-ml/csexp/csexp-1.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Parsing and printing of S-expressions in Canonical form"
+HOMEPAGE="https://github.com/ocaml-dune/csexp"
+SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-ml/result-1.5:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+DEPEND="${DEPEND}
+	test? ( dev-ml/ppx_expect )
+"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 66d943ca98ee..0c85a3d50878 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
index 584b3e379177..ac7a1e6b04fc 100644
--- a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
+++ b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Simple Class for OLE document interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 876b00dd4eae..e2a6ef8915f9 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/python-docs/python-docs-3.9.6.ebuild b/dev-python/python-docs/python-docs-3.9.6.ebuild
index bfc00bc95def..e68a93923813 100644
--- a/dev-python/python-docs/python-docs-3.9.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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 ~s390 sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 5f118efe6603..77dbf920d31d 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,7 +1,4 @@
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
-DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
-DIST SQLAlchemy-1.4.21.tar.gz 7701480 BLAKE2B fd7898844241e381df1356b33f42c99f1d91e50cdf702d3d04302225b64ba7e5bd4ed0d140b1ef2c6a3c4480c282ef3aa6f1301083de68c63d4b86448a9420d2 SHA512 90e3e63f339d784bf46928031c24804bfc2221044e08061f3da7db9c905013fbf4f0cada3b870a1662234b0169a51a678ff6bd837610ba18ab7cd1eea048a028
 DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
deleted file mode 100644
index 34d7b91a49dd..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
index 619a4c03c66b..4e64d3a7d6d6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
deleted file mode 100644
index e9bd1afd5434..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
index 7745b2405362..6201ea6d09c1 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
deleted file mode 100644
index 144d57d9ca1b..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
index 6203e2c692f8..3d2c8002bc0d 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index bddb9db3c2dc..b00b048fc0bc 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
index 85bb8013728f..9165f2cc8aa7 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX TeX-other-free "
 SLOT="0"
-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"
+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=""
 DEPEND=">=dev-texlive/texlive-langcjk-2021"
 
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
index f89273020d9c..495cceb84be1 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX "
 SLOT="0"
-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"
+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=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-basic-2019
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
index 6e5826d42705..8c08e18ce818 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-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"
+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=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-latex-2021
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
index 7b663fb9caa5..9b6ebd1b6316 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2021
 >=dev-texlive/texlive-latexextra-2021
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
index 535905f2c030..eed11fa6baff 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-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"
+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=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 "
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 656f92579033..d9248786eff9 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/byacc/byacc-20210619.ebuild b/dev-util/byacc/byacc-20210619.ebuild
index fa25e1a7d228..ad7086f143d1 100644
--- a/dev-util/byacc/byacc-20210619.ebuild
+++ b/dev-util/byacc/byacc-20210619.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/ccache/ccache-4.3-r2.ebuild b/dev-util/ccache/ccache-4.3-r2.ebuild
index f8900f1ddd7f..dbe17e3ac11a 100644
--- a/dev-util/ccache/ccache-4.3-r2.ebuild
+++ b/dev-util/ccache/ccache-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 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="static-c++ test"
 
 DEPEND=""
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
index adda92bb282a..79c9187e7075 100644
--- a/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index 67abbff8cb07..ebb587e2d3f8 100644
--- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 #RESTRICT="!test? ( test )"
diff --git a/dev-util/meson/meson-0.58.1.ebuild b/dev-util/meson/meson-0.58.1.ebuild
index 65a45a17dca8..ea602445e4c3 100644
--- a/dev-util/meson/meson-0.58.1.ebuild
+++ b/dev-util/meson/meson-0.58.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	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"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/pkgdev/pkgdev-0.1.7.ebuild b/dev-util/pkgdev/pkgdev-0.1.7.ebuild
index eab93eeabd0b..8902eff76956 100644
--- a/dev-util/pkgdev/pkgdev-0.1.7.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/strace/strace-5.12.ebuild b/dev-util/strace/strace-5.12.ebuild
index 4ca0aaaa86c2..f0b5ca9851ff 100644
--- a/dev-util/strace/strace-5.12.ebuild
+++ b/dev-util/strace/strace-5.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch b/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
new file mode 100644
index 000000000000..15f5ddbe99c0
--- /dev/null
+++ b/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
@@ -0,0 +1,42 @@
+From f1b416400479d861deffb4c5a40422dcdf190e85 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin@piware.de>
+Date: Fri, 23 Oct 2020 14:58:50 +0200
+Subject: [PATCH] =?UTF-8?q?preload:=20Declare=20=5F=5Fxstat*()=20prototype?=
+ =?UTF-8?q?s=20for=20glibc=20=E2=89=A5=202.32.9000?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Recent glibc deprecated/dropped the `__xstat*()` family from the header
+files, so the build started to fail on "no previous prototype". However,
+umockdev still needs needs to keep the wrappers to run programs that got
+built against an earlier glibc.
+
+Thus declare the prototype explicitly. It should still fail to build if
+glibc defines it differently.
+
+Fixes #108
+---
+ src/libumockdev-preload.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/libumockdev-preload.c b/src/libumockdev-preload.c
+index 9328dc1..9bbec62 100644
+--- a/src/libumockdev-preload.c
++++ b/src/libumockdev-preload.c
+@@ -1215,8 +1215,11 @@ int prefix ## stat ## suffix (const char *path, struct stat ## suffix *st) \
+ 
+ /* wrapper template for __xstat family; note that we abuse the sticky bit in
+  * the emulated /dev to indicate a block device (the sticky bit has no
+- * real functionality for device nodes) */
++ * real functionality for device nodes)
++ * This family got deprecated/dropped in glibc 2.32.9000, but we still need
++ * to keep it for a while for programs that were built against previous versions */
+ #define WRAP_VERSTAT(prefix, suffix) \
++int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st); \
+ int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st) \
+ { \
+     const char *p;								\
+-- 
+2.31.1
+
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index e66cf61108d9..e1f360c4d6e0 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 # Tests seem to hang forever
 # RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 9696d41d5f0c..4a73d2ef4082 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index ece4cfb4eb8c..c3394f88378a 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,3 @@
-DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
-DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
+DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543
diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
similarity index 84%
rename from games-fps/gzdoom/gzdoom-4.5.0.ebuild
rename to games-fps/gzdoom/gzdoom-4.6.1.ebuild
index a07fb6ae4bc3..7d3705e66a45 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
@@ -5,10 +5,11 @@ EAPI=7
 
 inherit cmake desktop xdg flag-o-matic
 
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
 SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz -> widepix-9273804.tar.gz )"
+	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
 
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
@@ -29,7 +30,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-g${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
 )
 
 src_prepare() {
@@ -38,7 +39,7 @@ src_prepare() {
 	if ! use non-free ; then
 		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
 	else
-		mv "${WORKDIR}/WidePix-92738042ca3a37f28153a09809d80a7d61090532/filter" wadsrc_widescreen/static/ || die
+		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || die
 	fi
 
 	cmake_src_prepare
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index bc61af29e3d5..0ca0bff368d9 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index a0d48e6ce2b0..14cbd5689639 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,3 +1,4 @@
+DIST openrct2-0.3.4.1.tar.gz 14222683 BLAKE2B 170a3beef36f00c1ad7845d8005e0d1e84c9ea4585e650f6bd9bf5ef2cca721b4b274e1a12801d7273a03860eb4c6f564bed9003359f1f4faef7abbf6ab5a028 SHA512 23267ce782d491a042a1733694d4bcdefb9af8a03eb70e0b9f13a464411d238d6c6962dc3cf57275e1641095c4bb859698fd1dae80df5b757a6718d42e5da57f
 DIST openrct2-0.3.4.tar.gz 14186428 BLAKE2B f30ee821e0993fc30cbb19f72ffefc47006582c79832a6041d93382278c1a5e8d366a0fba2bf8d81c1b58ce720f680e947885eb11322329bd63edd7f2bafa4d6 SHA512 13014f4e43b04ee34af713cdddf6b5fdcb8b928f9ff0d54bd7c4476074113a5b48ebb9942b5da6b1712a8f9033919c426948d771907b9a725821778e080413bc
 DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
 DIST openrct2-objects-1.2.1.zip 3381089 BLAKE2B d7b26e45dad74e5c2b30669bb9bfa96e6a9c8e0cf9dfc9b6205f0cd9f24075555267585d2132472eaf412ffc95eea668dfb0c6297ad17a52d02e998dfdee7cd8 SHA512 86d44325037184adcb59397f4d68c5248b0efbfaf1ac9416155fa46886a4784c2a1bf1ab4922fa75a3c6182f1025d1d41314ebafa8ae878b8a8d85670d16d3c9
diff --git a/games-simulation/openrct2/openrct2-0.3.4.1.ebuild b/games-simulation/openrct2/openrct2-0.3.4.1.ebuild
new file mode 100644
index 000000000000..2af32deb1f08
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.3.4.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+MY_PN="OpenRCT2"
+MY_PN_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_TS="title-sequences"
+MY_PV_OBJ="1.0.21"
+MY_PV_RPL="0.0.43"
+MY_PV_TS="0.1.2c"
+
+DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.org/"
+SRC_URI="
+	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
+	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
+	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dedicated +lightfx +opengl scripting test +truetype"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson
+	dev-libs/libzip:=
+	media-libs/libpng:0=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		opengl? ( virtual/opengl )
+	)
+	dev-libs/openssl:0=
+	scripting? ( dev-lang/duktape:= )
+	truetype? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dedicated? (
+		acct-group/openrct2
+		acct-user/openrct2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
+	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+	mkdir -p "${S}"/data/object || die
+	cd "${S}"/data/object || die
+	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
+
+	if use test; then
+		mkdir -p "${S}"/testdata/replays || die
+		cd "${S}"/testdata/replays || die
+		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat warnings as errors.
+	sed -e 's/-Werror//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Note: There is currently no support for Disord-RPC and Google Benchmark,
+	# as both packages do not exist in Gentoo, so support for them has been disabled.
+	local mycmakeargs=(
+		-DDISABLE_DISCORD_RPC=ON
+		-DDISABLE_GOOGLE_BENCHMARK=ON
+		-DDISABLE_GUI=$(usex dedicated)
+		-DDISABLE_HTTP=OFF
+		-DDISABLE_NETWORK=OFF
+		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+		-DDISABLE_TTF=$(usex !truetype)
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_LIGHTFX=$(usex lightfx)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		$(usex test "-DSYSTEM_GTEST=ON" "")
+		-DWITH_TESTS=$(usex test)
+		-DUSE_MMAP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Since the tests need the OpenRCT2 data,
+	# we need to symlink them into the build directory,
+	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
+	# It is currently not possible to override that path.
+	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
+	ln -s "${S}"/data "${BUILD_DIR}" || die
+
+	cmake_src_test
+}
+
+src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+	cmake_src_install
+
+	if use dedicated; then
+		newinitd "${FILESDIR}"/openrct2.initd openrct2
+		newconfd "${FILESDIR}"/openrct2.confd openrct2
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index bdc729da86e4..4ec0122e899a 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/wlroots/wlroots-0.14.0-r1.ebuild b/gui-libs/wlroots/wlroots-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..f87521b20da6
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.14.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SLOT="0/14"
+fi
+
+LICENSE="MIT"
+IUSE="x11-backend X"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.19.0
+	>=dev-libs/wayland-protocols-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	sys-auth/seatd:=
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	>=dev-util/meson-0.56.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		"-Dexamples=false"
+		"-Dwerror=false"
+		"-Drenderers=gles2"
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 37d74dc38438..eb52e3661f46 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	SLOT="0/14"
 fi
 
@@ -33,7 +33,7 @@ DEPEND="
 	x11-libs/pixman
 	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
-		x11-base/xorg-server[wayland]
+		x11-base/xwayland
 		x11-libs/libxcb:0=
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-wm
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index dc58af2d0f7a..46256a15f792 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/postfix-3.6.1.ebuild b/mail-mta/postfix/postfix-3.6.1.ebuild
index 61c1024f076b..3d5e70d6653f 100644
--- a/mail-mta/postfix/postfix-3.6.1.ebuild
+++ b/mail-mta/postfix/postfix-3.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 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 ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND="
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 4d699dd6bb2a..41d15003bf7c 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
index 7d0f6ccdc7c7..6b4950ef0f91 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/${MY_P}.zip"
 
 LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~riscv x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 75b6be5e515c..07a1f715bfd3 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
index cb08771dbe27..b1b183b9834f 100644
--- a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-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 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index afe77702ac0e..9eb05a18ef30 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2.ebuild
index fea5dc370d4b..adb492fe79e4 100644
--- a/media-sound/lilypond/lilypond-2.23.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 827ae8f5ec0c..0461c9c8a9d1 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 1726b1c2268d..1c93ad7b446e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jul 2021 19:09:04 +0000
+Tue, 27 Jul 2021 04:39:08 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1726b1c2268d..1c93ad7b446e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jul 2021 19:09:04 +0000
+Tue, 27 Jul 2021 04:39:08 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cf8c8e5c1398..e295b5f6dfe9 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 1129c3fdd964..adf67b727238 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/ananicy-2.2.1-r1 b/metadata/md5-cache/app-admin/ananicy-2.2.1-r1
index f746d9aef445..bd63ada8bc4f 100644
--- a/metadata/md5-cache/app-admin/ananicy-2.2.1-r1
+++ b/metadata/md5-cache/app-admin/ananicy-2.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=ANother Auto NICe daemon
 EAPI=8
 HOMEPAGE=https://github.com/Nefelim4ag/Ananicy
 IUSE=python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=GPL-3
 RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) 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] ) sys-process/schedtool
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Nefelim4ag/Ananicy/archive/2.2.1.tar.gz -> ananicy-2.2.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3788874b78237698b5dba7de4778ce88
+_md5_=d1922b1d61f30fdf2e42f7872748dbff
diff --git a/metadata/md5-cache/app-admin/logrotate-3.18.1 b/metadata/md5-cache/app-admin/logrotate-3.18.1
index 567d3124bf7d..56a7423cc7be 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.18.1
+++ b/metadata/md5-cache/app-admin/logrotate-3.18.1
@@ -5,10 +5,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=7
 HOMEPAGE=https://github.com/logrotate/logrotate
 IUSE=acl +cron selinux
-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 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.18.1/logrotate-3.18.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7cb18c0aeab56bcc07988488b40e993d
+_md5_=3bac2fa11248d80928c501c9a4c3a0f5
diff --git a/metadata/md5-cache/app-admin/verynice-1.1-r3 b/metadata/md5-cache/app-admin/verynice-1.1-r3
index 1eb9cc52b900..f8a2e79c1ae6 100644
--- a/metadata/md5-cache/app-admin/verynice-1.1-r3
+++ b/metadata/md5-cache/app-admin/verynice-1.1-r3
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A tool for dynamically adjusting the nice-level of processes
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20130621090315/http://thermal.cnde.iastate.edu/~sdh4/verynice/
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gentoo/verynice-1.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64d36721edd472be6f5368aa1bb0640f
+_md5_=6e063f7f16c80b9f6c51cf724037358a
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 5aa7d5f44f58..a0b3ebe9b73d 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.0 b/metadata/md5-cache/app-arch/zstd-1.5.0
index 9e5f9243d75a..25400fc2ba7c 100644
--- a/metadata/md5-cache/app-arch/zstd-1.5.0
+++ b/metadata/md5-cache/app-arch/zstd-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs +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 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73aff9a9488b5ac37c627e87b27616b1
+_md5_=51f1cfce77e83dd5b1206f695905f275
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index e64bfb7375aa..10b0ed44a6a0 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.12 b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.12
index 221a092462c1..a8439434b7bf 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.12
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.12
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-
 SLOT=0
 SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.12.12.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03c63513d7627dd1a0058eace7b13794
+_md5_=81a5bb717a61dabfd70d57e7ed19fc78
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 3b996568af2b..894b962566b2 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/iat-0.1.7-r1 b/metadata/md5-cache/app-cdr/iat-0.1.7-r1
index 961e77ea18b9..34dda200b307 100644
--- a/metadata/md5-cache/app-cdr/iat-0.1.7-r1
+++ b/metadata/md5-cache/app-cdr/iat-0.1.7-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=configure
 DESCRIPTION=BIN, MDF, PDI, CDI, NRG, and B5I converters
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.berlios.de/software/iso9660-analyzer-tool
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://download.sourceforge.net/iat.berlios/iat-0.1.7.tar.bz2
-_md5_=3044fa804e3544b166016be267aaa502
+_md5_=f240e46a86c9a56056014fbcd1d00373
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 817e100503af..260043c24956 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/mg-20210314 b/metadata/md5-cache/app-editors/mg-20210314
index edf8e8b6c4b4..61953625abc7 100644
--- a/metadata/md5-cache/app-editors/mg-20210314
+++ b/metadata/md5-cache/app-editors/mg-20210314
@@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=7
 HOMEPAGE=https://homepage.boetes.org/software/mg/
 IUSE=livecd
-KEYWORDS=~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
 SRC_URI=https://github.com/hboetes/mg/archive/20210314.tar.gz -> mg-20210314.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ebcddfb08deb5c16fbe8d426a496469
+_md5_=4c5c7843bcdedd9afbdddc5a67556ae6
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 3b82e15417f0..99b84f288e9d 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/containerd-1.4.6 b/metadata/md5-cache/app-emulation/containerd-1.4.6
deleted file mode 100644
index 3fd945a81d62..000000000000
--- a/metadata/md5-cache/app-emulation/containerd-1.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/go-md2man virtual/pkgconfig test? ( btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc95 ) >=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
-DESCRIPTION=A daemon to control runC
-EAPI=7
-HOMEPAGE=https://containerd.io/
-IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc95
-RESTRICT=strip strip test
-SLOT=0
-SRC_URI=https://github.com/containerd/containerd/archive/v1.4.6.tar.gz -> containerd-1.4.6.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bd7b31b5a32b7b17c8c50bc19d663c56
diff --git a/metadata/md5-cache/app-emulation/containerd-1.5.2 b/metadata/md5-cache/app-emulation/containerd-1.5.2
deleted file mode 100644
index c410ded1a0f5..000000000000
--- a/metadata/md5-cache/app-emulation/containerd-1.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/go-md2man virtual/pkgconfig >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
-DESCRIPTION=A daemon to control runC
-EAPI=7
-HOMEPAGE=https://containerd.io/
-IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc95
-RESTRICT=strip strip test
-SLOT=0
-SRC_URI=https://github.com/containerd/containerd/archive/v1.5.2.tar.gz -> containerd-1.5.2.tar.gz https://dev.gentoo.org/~williamh/dist/containerd-man-1.5.2.tar.xz
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b530df4e2edcfe8e4c2d508a1ee5769c
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc95 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc95
deleted file mode 100644
index 40547b3daab2..000000000000
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc95
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/go-md2man test? ( seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) ) >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=seccomp? ( sys-libs/libseccomp )
-DESCRIPTION=runc container cli tools
-EAPI=7
-HOMEPAGE=http://runc.io
-IUSE=apparmor hardened +kmem +seccomp test kernel_linux
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
-LICENSE=Apache-2.0 BSD-2 BSD MIT
-RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0-rc95.tar.gz -> runc-1.0.0_rc95.tar.gz
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=639abf1bd451d548130324a86560982a
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.10 b/metadata/md5-cache/app-emulation/wine-staging-6.10
index 009b07a78e2b..4df9cc531f87 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.10
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.10
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.10.tar.gz -> wine-staging-6.10.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7086b743b508dabe71ee7bd8f06c51a4
+_md5_=3280e006e3608b1d08f4083aeaabb5ba
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.11 b/metadata/md5-cache/app-emulation/wine-staging-6.11
index 57b4729e9f69..2cd11a5bec82 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.11
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.11
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.11
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.11.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.11.tar.gz -> wine-staging-6.11.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7086b743b508dabe71ee7bd8f06c51a4
+_md5_=3280e006e3608b1d08f4083aeaabb5ba
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.12 b/metadata/md5-cache/app-emulation/wine-staging-6.12
index 5dfa2743660f..7914ebbd4aa5 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.12
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.12
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.12
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.12.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.12.1.tar.gz -> wine-staging-6.12.1.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=65475c962dc61fc4d629663fe22373cd
+_md5_=13f0548afa2aad27a38828bcc396714e
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.13 b/metadata/md5-cache/app-emulation/wine-staging-6.13
index bfc22e6a7509..cfb19ce5f1f9 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.13
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.13
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.13
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.13.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.13.tar.gz -> wine-staging-6.13.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f4b52e9fed9bfa9413e6ec84fc7f03db
+_md5_=f1711a59c0dde25f5bb48a27d6ab6b1e
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 0c1f2809b102..68d30993ed83 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=23edf5f23f83a653aed658f00b804a7b
+_md5_=6f35a4835c3d11d5375e55139cd5cb2e
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.0 b/metadata/md5-cache/app-emulation/wine-vanilla-6.0
index 4f02429c985a..986c3ba5be01 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.0
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.0
 SRC_URI=https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3fc2528312cda88c91c0d40550fc7f06
+_md5_=36bc19a060648cf514251eaa0f55935a
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
index f402618d7389..65935d91ac51 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.0.1
 SRC_URI=https://dl.winehq.org/wine/source/6.0/wine-6.0.1.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=96c26e8d98eb441ae7fa342aef979d72
+_md5_=7113b7b1cd53b1b5ea9a8bb37bfbaa07
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.10 b/metadata/md5-cache/app-emulation/wine-vanilla-6.10
index b11802902ddf..0c6a61cfcfa9 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.10
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.10
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22967e39a94ecfd9752f335ab06fe863
+_md5_=b42d6ad3c07fa9ef7e6594f276f82814
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.11 b/metadata/md5-cache/app-emulation/wine-vanilla-6.11
index 196de82c2fa6..a2cc545d66b2 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.11
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.11
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.11
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.11.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22967e39a94ecfd9752f335ab06fe863
+_md5_=b42d6ad3c07fa9ef7e6594f276f82814
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.12 b/metadata/md5-cache/app-emulation/wine-vanilla-6.12
index 808c06f6ad22..7a7e91bc1a46 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.12
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.12
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.12
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.12.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f24765578b7c1fc4dcbb032898b2193
+_md5_=6ad9a0ecc2c274c27118a2e427cdaead
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.13 b/metadata/md5-cache/app-emulation/wine-vanilla-6.13
index a23b2ab248de..244f568a3bb8 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.13
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.13
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.13
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.13.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f24765578b7c1fc4dcbb032898b2193
+_md5_=6ad9a0ecc2c274c27118a2e427cdaead
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index db9fbd593897..7088d6f4aaee 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22967e39a94ecfd9752f335ab06fe863
+_md5_=b42d6ad3c07fa9ef7e6594f276f82814
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 16addedc98d1..e20796c3234b 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20180315-r1 b/metadata/md5-cache/app-i18n/man-pages-ja-20180315-r1
index 4abe9c3e2004..d990b07231b8 100644
--- a/metadata/md5-cache/app-i18n/man-pages-ja-20180315-r1
+++ b/metadata/md5-cache/app-i18n/man-pages-ja-20180315-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=A collection of manual pages translated into Japanese
 EAPI=6
 HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
-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+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20180315.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
-_md5_=33a38d99672d30a7a5c09ae80383533c
+_md5_=ce7699d02b06fba60a6ed6b5acc108d6
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e1180c9942fb..22b4425615ef 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/pax-utils-1.3.2 b/metadata/md5-cache/app-misc/pax-utils-1.3.2
index e2f37267228a..1245445109b5 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.2
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug kernel_linux python seccomp python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) 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] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.3.2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.3.2.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d878bda7cae00c1142517f048fdd7cd7
+_md5_=896e29e622190f092c7ce3cb4e7c8e07
diff --git a/metadata/md5-cache/app-misc/rpick-0.8.4 b/metadata/md5-cache/app-misc/rpick-0.8.4
index fd8687caae0c..0adbd431cde2 100644
--- a/metadata/md5-cache/app-misc/rpick-0.8.4
+++ b/metadata/md5-cache/app-misc/rpick-0.8.4
@@ -4,9 +4,9 @@ DESCRIPTION=Helps you pick items from a list by various algorithms
 EAPI=7
 HOMEPAGE=https://github.com/bowlofeggs/rpick
 IUSE=debug
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.4.0/download -> approx-0.4.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.4/download -> assert_cmd-1.0.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.4/download -> crossbeam-utils-0.8.4.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/downcast/0.10.0/download -> downcast-0.10.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fragile/1.0.0/download -> fragile-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.1/download -> matrixmultiply-0.3.1.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/mockall/0.9.1/download -> mockall-0.9.1.crate https://crates.io/api/v1/crates/mockall_derive/0.9.1/download -> mockall_derive-0.9.1.crate https://crates.io/api/v1/crates/nalgebra/0.26.2/download -> nalgebra-0.26.2.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_distr/0.4.0/download -> rand_distr-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpick/0.8.4/download -> rpick-0.8.4.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/simba/0.4.0/download -> simba-0.4.0.crate https://crates.io/api/v1/crates/statrs/0.14.0/download -> statrs-0.14.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e7816185e4c463c2c4deb5aa59c5badc
+_md5_=e677f7ca026d2cf482859ab38fb13b0c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 27dc27126a98..9f9382a79ee5 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/t1utils-1.41-r2 b/metadata/md5-cache/app-text/t1utils-1.41-r2
index 2a7e680f3317..3a4201af56f2 100644
--- a/metadata/md5-cache/app-text/t1utils-1.41-r2
+++ b/metadata/md5-cache/app-text/t1utils-1.41-r2
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Type 1 Font utilities
 EAPI=6
 HOMEPAGE=http://www.lcdf.org/type/#t1utils
-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
+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=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	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
-_md5_=a3eb0fcf5e154397f6a705759bce51fe
+_md5_=e28e30ad4cecb7b681c8b1947ae6e85f
diff --git a/metadata/md5-cache/app-text/texi2html-5.0-r1 b/metadata/md5-cache/app-text/texi2html-5.0-r1
index ddd9a027ffdf..879f94c05477 100644
--- a/metadata/md5-cache/app-text/texi2html-5.0-r1
+++ b/metadata/md5-cache/app-text/texi2html-5.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl script that converts Texinfo to HTML
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/texi2html/
 IUSE=unicode
-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
+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+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT
 RDEPEND=dev-lang/perl dev-perl/libintl-perl unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://nongnu/texi2html/texi2html-5.0.tar.bz2
 _eclasses_=prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=0e4d050fdf877c417c71276f39edb4b5
+_md5_=af83a0c87b524875b6f3cb78324a4e4f
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 13d123050039..438f90ee1587 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
deleted file mode 100644
index 49ad5ecdbbcb..000000000000
--- a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Integer logarithms
-EAPI=7
-HOMEPAGE=https://github.com/Bodigrim/integer-logarithms
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/1.0.3
-SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a5df11a393b417de735b2ffb1fa1f69
diff --git a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1 b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
index 45751afe6152..d8626ad43481 100644
--- a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HAProxy protocol 1.5 support for io-streams
 EAPI=7
 HOMEPAGE=http://snapframework.com/
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RDEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0/1.0.1.0
 SRC_URI=https://hackage.haskell.org/package/io-streams-haproxy-1.0.1.0/io-streams-haproxy-1.0.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe917edb129e2153e4a1739067bcd81e
+_md5_=f6a7defa73962c7a63cf3e830dcb73eb
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
index c65aa19c83a0..67105c0cdd08 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Semigroupoids: Category sans id
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/semigroupoids
-IUSE=+comonad +containers +contravariant +distributive +tagged +unordered-containers doc hscolour profile test
+IUSE=+comonad +contravariant +distributive +tagged +unordered-containers doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
+RDEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
 RESTRICT=test
 SLOT=0/5.3.4
 SRC_URI=https://hackage.haskell.org/package/semigroupoids-5.3.4/semigroupoids-5.3.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0fa89d432a58783a22283f7ab0390ee7
+_md5_=02fbd629f1a493f96e95453d94a08238
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index e4a9ecae0919..b771847d2c11 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/openjdk-11.0.12_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
new file mode 100644
index 000000000000..cf51662b7bc0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11= ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) 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 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Open source implementation of the Java programming language
+EAPI=6
+HOMEPAGE=https://openjdk.java.net
+IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=GPL-2
+RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=javafx? ( alsa !headless-awt )
+SLOT=11
+SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.12-ga.tar.bz2 -> openjdk-11.0.12_p7.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=663307081d332907ca8d8747c2949aef
diff --git a/metadata/md5-cache/dev-java/openjdk-8.302_p08 b/metadata/md5-cache/dev-java/openjdk-8.302_p08
new file mode 100644
index 000000000000..8f6f7dec78d2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-8.302_p08
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Open source implementation of the Java programming language
+EAPI=6
+HOMEPAGE=https://openjdk.java.net
+IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=javafx? ( dev-java/openjfx:8 )
+RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+SLOT=8
+SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u302-ga.tar.bz2 -> openjdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u302-ga.tar.bz2 -> openjdk-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u302-ga.tar.bz2 -> openjdk-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u302-ga.tar.bz2 -> openjdk-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u302-ga.tar.bz2 -> openjdk-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u302-ga.tar.bz2 -> openjdk-nashorn-8.302_p08.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.302_p08.tar.bz2 )
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fd1bedb174eb9aacc21e9e2072b0002d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
index b7f0cc019b70..f4c1cf2b3534 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
@@ -4,10 +4,10 @@ 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
+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.48/src/apache-tomcat-9.0.48-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=cfc424879061b9ee37b1e58025f535b2
+_md5_=d46a783fc7a67d13ca7e7d74d4a6cd99
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e5e46230fd48..24be9ae29363 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/python-3.9.6 b/metadata/md5-cache/dev-lang/python-3.9.6
index 507fa3c7d345..39f90faa7a6e 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.6
+++ b/metadata/md5-cache/dev-lang/python-3.9.6
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-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=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz.asc )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=11ee814a5f69f86bfa46804e47c4d962
+_md5_=66f1b1bcd486b8ad2edffe546dc9a828
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fe8b5b640d29..a36b60e87a05 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/cdk-5.0.20210324-r2 b/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r2
index d79c48ba0eb3..c0091ef7001c 100644
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r2
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20210324-r2
@@ -5,9 +5,9 @@ DESCRIPTION=A library of curses widgets
 EAPI=7
 HOMEPAGE=https://dickey.his.com/cdk/cdk.html
 IUSE=examples unicode
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 SLOT=0/6
 SRC_URI=ftp://ftp.invisible-island.net/cdk/cdk-5.0-20210324.tgz
-_md5_=348548ddde08a6e3f93dd32a92cf0d37
+_md5_=67c0b5f7d200f5ad0fb8b570fdf7c190
diff --git a/metadata/md5-cache/dev-libs/ell-0.41 b/metadata/md5-cache/dev-libs/ell-0.41
index 21715c91a461..1cfe5b70a3a2 100644
--- a/metadata/md5-cache/dev-libs/ell-0.41
+++ b/metadata/md5-cache/dev-libs/ell-0.41
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie test kernel_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
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( 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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.41.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e463fee66c2d611abce6e393a5ded25
+_md5_=d50d598ebfeb80447cebaffa24e8843b
diff --git a/metadata/md5-cache/dev-libs/imath-3.0.5-r1 b/metadata/md5-cache/dev-libs/imath-3.0.5-r1
index 28a697349497..31ad6f52d4c0 100644
--- a/metadata/md5-cache/dev-libs/imath-3.0.5-r1
+++ b/metadata/md5-cache/dev-libs/imath-3.0.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Imath basic math package
 EAPI=7
 HOMEPAGE=https://imath.readthedocs.io
 IUSE=doc large-stack python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!dev-libs/imath:0 sys-libs/zlib 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] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3/28
 SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.0.5.tar.gz -> imath-3.0.5.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	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_=71431d7c88097510e823d630c277998b
+_md5_=d32222a1b51bbdadcda320bd516f1526
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.45 b/metadata/md5-cache/dev-libs/libpcre-8.45
index e57d3f1a0609..41cfa39d0e56 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.45
+++ b/metadata/md5-cache/dev-libs/libpcre-8.45
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode 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 split-usr
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.45.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.45.tar.bz2
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=519a3a6453b31bdf8e9d845cc66e629b
+_md5_=5b4eb88b8937b5ad534e03ad17cdbb51
diff --git a/metadata/md5-cache/dev-libs/weston-9.0.0-r1 b/metadata/md5-cache/dev-libs/weston-9.0.0-r1
new file mode 100644
index 000000000000..9d059024f212
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/weston-9.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=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/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+DESCRIPTION=Wayland reference compositor
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
+IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT CC-BY-SA-3.0
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/weston-9.0.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=24ddf565116d8094a7d872626ab0801a
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index 695d13be15c1..49433c3379c7 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing seatd +suid systemd test wayland-compositor webp +X xwayland
 LICENSE=MIT CC-BY-SA-3.0
 PROPERTIES=live
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=535da723a5fd74a6522007f7e718e461
+_md5_=f930f01f1b6809c47fb893cf8cb0d685
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 86eed8875d2e..8c304cc6119f 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/csexp-1.5.1 b/metadata/md5-cache/dev-ml/csexp-1.5.1
new file mode 100644
index 000000000000..b289f276fe03
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/csexp-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/result-1.5:=[ocamlopt=] test? ( dev-ml/ppx_expect ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Parsing and printing of S-expressions in Canonical form
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-dune/csexp
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/1.5.1
+SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=9cf84a87c122055a234eb249109e442e
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 5012bd899403..2d2472860642 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
index d5d7479dd46e..8f899efcf8a9 100644
--- a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple Class for OLE document interface
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/OLE-Storage_Lite
 IUSE=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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=0fde6a9a0e7ec9966b5e2f8df8c737a0
+_md5_=45e361c917763e707deeb9a85f5fd74f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d444762a034c..80ec8f94e914 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/python-docs-3.9.6 b/metadata/md5-cache/dev-python/python-docs-3.9.6
index 8243566c18b1..af65de02a69c 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.9.6
+++ b/metadata/md5-cache/dev-python/python-docs-3.9.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-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 ~s390 sparc ~x86
 LICENSE=PSF-2
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/doc/3.9.6/python-3.9.6-docs-html.tar.bz2
-_md5_=974b1fb750dfdd3a4298d6c3d54a57e2
+_md5_=928f6c95d95a2fe221169bc6731c0cad
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.15 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.15
deleted file mode 100644
index 5b62f1643875..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=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 postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=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/S/SQLAlchemy/SQLAlchemy-1.4.15.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=728f185072e522e9c3d0af2dcadf1e56
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.18 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
index 4253cd820b06..0ada42dbc50d 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.18.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23d643bd3c2e627a912edd6e35b6c3ff
+_md5_=b351792178e12317f0d6c778b1077cce
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.19 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.19
deleted file mode 100644
index b63204eab7f4..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=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=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.19.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=445f4c5f5dcb70e3ee3b314ffeeb2924
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
index 2916f94c40f5..7dca4249acbf 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.20.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46fc967cf30896e065af5ac637dc89a6
+_md5_=b2b341d28d7306d8f88376fb49293564
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.21 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.21
deleted file mode 100644
index c7d4111d4139..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=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=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.21.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2fa4fcfd4e3c775dc85a8c45a07b3444
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.22 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
index 9731c0fcb3fb..ee7162e9f27b 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.22.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4d808b6f730774eb7302bf0e4e8b3c3d
+_md5_=8a97f4c527eb86bc28fc38e1515a870d
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index a9d83919e7e6..2a590902d51c 100644
Binary files a/metadata/md5-cache/dev-texlive/Manifest.gz and b/metadata/md5-cache/dev-texlive/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2021 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2021
index b1a5a21f263b..d059bcab85b9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Chinese
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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
+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=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-ttf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-ttf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-by-example-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-by-example-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-faq-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-faq-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-manual-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-manual-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-faq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-faq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fandol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fandol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-chinese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-chinese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-install-latex-guide-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-install-latex-guide-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-chinese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-chinese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanicolle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanicolle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-han-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-han-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qyxf-book-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qyxf-book-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texproposal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texproposal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upzhkinsoku-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upzhkinsoku-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlineskip-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlineskip-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-uptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-uptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhspacing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhspacing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langchinese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langchinese-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-ttf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-ttf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-by-example-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-by-example-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-faq-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-faq-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-manual-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-manual-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-faq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-faq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fandol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fandol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-install-latex-guide-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-install-latex-guide-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-chinese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-chinese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanicolle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanicolle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-han.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-han.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qyxf-book.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qyxf-book.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texproposal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texproposal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upzhkinsoku.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upzhkinsoku.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlineskip.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlineskip.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-uptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-uptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhspacing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhspacing.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=250998d669365e23c4ef5dc185b50056
+_md5_=37736811ca0aeb40cb43bdab04dd2feb
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2021 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2021
index 805ea994933f..a49849b6f853 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Chinese/Japanese/Korean (base)
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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
+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=BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-basic-2019 >=app-text/texlive-core-2010[cjk] >=dev-texlive/texlive-latex-2011 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adobemapping-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adobemapping-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkutils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garuda-c90-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garuda-c90-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixjfm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixjfm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jfmutil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jfmutil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-norasi-c90-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-norasi-c90-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtatescale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtatescale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langcjk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langcjk-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkutils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkutils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixjfm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixjfm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jfmutil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jfmutil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtatescale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtatescale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafont.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garuda-c90.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garuda-c90.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-norasi-c90.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-norasi-c90.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=a858131cc5432f67e9cd681562fed5b4
+_md5_=7c26b179745040462e68bc83c508e806
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
index 11d8931891ee..8a8707944b3c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Cyrillic
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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
+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-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-churchslavonic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-churchslavonic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmcyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmcyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-bin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-bin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrplain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrplain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskdx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskdx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-belarusian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-belarusian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-churchslavonic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-churchslavonic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-mongolian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-mongolian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ukrainian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ukrainian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhcyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhcyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-mongol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-mongol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-ukr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-ukr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpman-ru-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpman-ru-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numnameru-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numnameru-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-translation-bg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-translation-bg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruhyphen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruhyphen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-russ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-russ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-apostrophe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-apostrophe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-date-lat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-date-lat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-def-cyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-def-cyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-lig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-lig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ru-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ru-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-sr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-sr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ukrhyph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ukrhyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langcyrillic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langcyrillic-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmcyr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmcyr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-bin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-bin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskdx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskdx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-mongol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-mongol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-russian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-russian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-ukr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-ukr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpman-ru.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpman-ru.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numnameru.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numnameru.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-translation-bg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-translation-bg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-russ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-russ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-apostrophe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-apostrophe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-date-lat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-date-lat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-def-cyr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-def-cyr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-lig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-lig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ru.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ru.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-sr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-sr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ukrhyph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ukrhyph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhcyr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhcyr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruhyphen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruhyphen.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=f6a8bf57f415e12ab50a2a50fb6ce6fe
+_md5_=aaaf7536e210aa9c40314594498ed839
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
index a7b6e7d56d71..812fe7c42eb8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Japanese
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2021 >=dev-texlive/texlive-latexextra-2021 !<dev-texlive/texlive-basic-2016 dev-lang/ruby >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxbase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxbase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcjkjatype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcjkjatype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxghost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxghost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaholiday-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaholiday-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjalipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjalipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaprnind-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaprnind-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjatoucs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjatoucs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxorigcapt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxorigcapt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxwareki-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxwareki-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-convbkmk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-convbkmk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotesj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotesj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentombow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentombow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifxptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifxptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq-deluxe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq-deluxe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-japanese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-japanese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbibtex-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbibtex-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-tools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-tools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platexcheat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platexcheat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plautopatch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plautopatch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-manual-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-manual-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex2pdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex2pdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxbase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxbase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxchfon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxchfon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxcjkcat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxcjkcat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjahyper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjahyper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjodel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjodel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxufont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxufont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ja-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ja-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wadalab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wadalab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafbfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafbfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjatype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjatype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langjapanese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langjapanese-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxbase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxbase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcjkjatype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcjkjatype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxghost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxghost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaholiday.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaholiday.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjalipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjalipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaprnind.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaprnind.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjatoucs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjatoucs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxorigcapt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxorigcapt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxwareki.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxwareki.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-convbkmk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-convbkmk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotesj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotesj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentombow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentombow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifxptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifxptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq-deluxe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq-deluxe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-japanese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-japanese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbibtex-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbibtex-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-tools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-tools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platexcheat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platexcheat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plautopatch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plautopatch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-manual.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-manual.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex2pdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex2pdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxbase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxbase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxchfon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxchfon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxcjkcat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxcjkcat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjahyper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjahyper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjodel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjodel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxufont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxufont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ja.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ja.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wadalab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wadalab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafbfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafbfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjatype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjatype.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=e74a23d6c606c2c44bf734676eab0a2d
+_md5_=3d1e6b23e28017b87a6fe08b46c17253
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2021 b/metadata/md5-cache/dev-texlive/texlive-metapost-2021
index ef7e79d11e6c..3c56cf2a1e42 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive MetaPost and Metafont packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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
+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-1 GPL-2 GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-automata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-automata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbcard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbcard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blockdraw_mp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blockdraw_mp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpolynomial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpolynomial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmarrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmarrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviincl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dviincl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsincl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsincl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exteps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exteps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-featpost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-featpost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fiziko-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fiziko-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garrigues-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garrigues-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hatching-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hatching-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcf2graph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcf2graph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metago-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metago-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaobj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaobj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-colorbrewer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-colorbrewer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metauml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metauml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mp3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mp3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpattern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpattern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piechartmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piechartmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repere-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repere-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slideshow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slideshow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suanpan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suanpan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeddice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeddice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-metapost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-metapost-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-automata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-automata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbcard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbcard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blockdraw_mp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blockdraw_mp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpolynomial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpolynomial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmarrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmarrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviincl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dviincl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsincl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsincl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exteps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exteps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-featpost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-featpost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fiziko.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fiziko.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garrigues.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garrigues.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hatching.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hatching.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcf2graph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcf2graph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metago.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metago.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaobj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaobj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-colorbrewer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-colorbrewer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metauml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metauml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mp3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mp3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpattern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpattern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piechartmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piechartmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repere.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repere.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slideshow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slideshow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suanpan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suanpan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeddice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeddice.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=d8787303f1a6c9d8e0afdbee099b5c57
+_md5_=d4bb95a1021a94f917cf9a34bfd1daf1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b1ea4fdaa56b..04cad7d3af61 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/byacc-20210619 b/metadata/md5-cache/dev-util/byacc-20210619
index 34f30b74eca8..6c4a916d58f3 100644
--- a/metadata/md5-cache/dev-util/byacc-20210619
+++ b/metadata/md5-cache/dev-util/byacc-20210619
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=the best variant of the Yacc parser generator
 EAPI=7
 HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20210619.tgz
-_md5_=2908997f7018bf8c5e48ede56b3af819
+_md5_=75164ea3da3e5723e9a279ade17dd2e3
diff --git a/metadata/md5-cache/dev-util/ccache-4.3-r2 b/metadata/md5-cache/dev-util/ccache-4.3-r2
index e3264086c36a..b6c07f4c60ca 100644
--- a/metadata/md5-cache/dev-util/ccache-4.3-r2
+++ b/metadata/md5-cache/dev-util/ccache-4.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
 IUSE=static-c++ test
-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
 RDEPEND=app-arch/zstd:0= dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.3/ccache-4.3.tar.xz
 _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_=d6e745ba5e65ad65a8af05a78a5d2c27
+_md5_=70e288abed9e0ba38ee6757ef13198c5
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.21.2 b/metadata/md5-cache/dev-util/checkbashisms-2.21.2
index dec59fa026ec..722c371b078c 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.21.2
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.21.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
 EAPI=7
 HOMEPAGE=https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.21.2.tar.xz
-_md5_=b01d22ee14a1dc0096900be5d0c3e727
+_md5_=2d167535e207b62ec69993220957e803
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.3 b/metadata/md5-cache/dev-util/dejagnu-1.6.3
index 3f7b51fd9b91..052fc3eebc86 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.3
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for testing other programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-tcltk/expect
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.3.tar.gz
-_md5_=6124901e57c23cb104c3c58f3dda55c0
+_md5_=811db719d3b7a3654458c7e6708afbc9
diff --git a/metadata/md5-cache/dev-util/meson-0.58.1 b/metadata/md5-cache/dev-util/meson-0.58.1
index 29cbbd582f53..c1e39acc2f5e 100644
--- a/metadata/md5-cache/dev-util/meson-0.58.1
+++ b/metadata/md5-cache/dev-util/meson-0.58.1
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 IUSE=test 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 ~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=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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.58.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_=843cd11db3125c5b3356efa3e5349076
+_md5_=66318f790361e1dd3c9aa91616ff3336
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.7 b/metadata/md5-cache/dev-util/pkgdev-0.1.7
index 60641919fe47..eec217d61836 100644
--- a/metadata/md5-cache/dev-util/pkgdev-0.1.7
+++ b/metadata/md5-cache/dev-util/pkgdev-0.1.7
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of tools for Gentoo development
 EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgdev
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x64-macos
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git 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/p/pkgdev/pkgdev-0.1.7.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80fa09bbc7ce395a36a99c15f0144f99
+_md5_=c800e52c41eaf363b2cb57bdb8873f66
diff --git a/metadata/md5-cache/dev-util/strace-5.12 b/metadata/md5-cache/dev-util/strace-5.12
index 283e7a8b6f80..315c28d5a1b8 100644
--- a/metadata/md5-cache/dev-util/strace-5.12
+++ b/metadata/md5-cache/dev-util/strace-5.12
@@ -5,11 +5,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=7
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a82ad958896cd2c6d4d911401a7a26dd
+_md5_=71454020df886ca172b3146ac3ca4bdb
diff --git a/metadata/md5-cache/dev-util/umockdev-0.12.1 b/metadata/md5-cache/dev-util/umockdev-0.12.1
index a3166cfe2bd7..0c1e897f1a1a 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.12.1
+++ b/metadata/md5-cache/dev-util/umockdev-0.12.1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.12.1/umockdev-0.12.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=000ef98278b89d7e78df819da64b4890
+_md5_=9cb776f3f7318a8af0849f8454548354
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 85e20e0c28e6..6419098a1bba 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.5.0 b/metadata/md5-cache/games-fps/gzdoom-4.6.1
similarity index 83%
rename from metadata/md5-cache/games-fps/gzdoom-4.5.0
rename to metadata/md5-cache/games-fps/gzdoom-4.6.1
index f4213c40e658..d5275f3b8469 100644
--- a/metadata/md5-cache/games-fps/gzdoom-4.5.0
+++ b/metadata/md5-cache/games-fps/gzdoom-4.6.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )
 RDEPEND=app-arch/bzip2 media-libs/libsdl2[opengl] media-libs/openal media-libs/zmusic sys-libs/zlib virtual/jpeg:0 gtk? ( x11-libs/gtk+:3 )
 SLOT=0
-SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.5.0.tar.gz -> gzdoom-4.5.0.tar.gz non-free? ( https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz -> widepix-9273804.tar.gz )
+SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.6.1.tar.gz -> gzdoom-4.6.1.tar.gz non-free? ( https://github.com/nashmuhandes/WidePix/archive/d458411db4795dfd1420cf1c6456f6d2999b3bad.tar.gz -> widepix-d458411.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_=d7ff249edebfe89d835cec79e6f3bf2c
+_md5_=806592e9fddd0a987b553ab578ebe5c7
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index d94deb65da10..0e853f0b6a5b 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.4.1 b/metadata/md5-cache/games-simulation/openrct2-0.3.4.1
new file mode 100644
index 000000000000..f33880324a82
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.4.1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
+DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
+EAPI=7
+HOMEPAGE=https://openrct2.org/
+IUSE=dedicated +lightfx +opengl scripting test +truetype
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.4.1.tar.gz -> openrct2-0.3.4.1.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.43/replays.zip -> openrct2-replays-0.0.43.zip )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=40566333129cb8af64cffadedebc96c4
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index ea31830e2263..19f09f307edd 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/wlroots-0.14.0-r1 b/metadata/md5-cache/gui-libs/wlroots-0.14.0-r1
new file mode 100644
index 000000000000..0251c28ca559
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wlroots-0.14.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.17 >=dev-util/meson-0.56.0 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
+EAPI=7
+HOMEPAGE=https://github.com/swaywm/wlroots
+IUSE=x11-backend X
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+SLOT=0/14
+SRC_URI=https://github.com/swaywm/wlroots/archive/0.14.0.tar.gz -> wlroots-0.14.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=14fa695d3b7d7983ced42a01d5339382
diff --git a/metadata/md5-cache/gui-libs/wlroots-9999 b/metadata/md5-cache/gui-libs/wlroots-9999
index fd23bc7dd010..fa885ee948df 100644
--- a/metadata/md5-cache/gui-libs/wlroots-9999
+++ b/metadata/md5-cache/gui-libs/wlroots-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-libs/wayland-protocols-1.17 >=dev-util/meson-0.58.1 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
 DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/wlroots
 IUSE=x11-backend X
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
 SLOT=0/9999
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=43ae7f37a273de938da73304084267b2
+_md5_=7c13f3891a707c2b4318235c8fa721ef
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 9bd0a40d45c4..68acb6416912 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/postfix-3.6.1 b/metadata/md5-cache/mail-mta/postfix-3.6.1
index f09981c54306..784866ec91ed 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.6.1
+++ b/metadata/md5-cache/mail-mta/postfix-3.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=7
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0884ecc3fb7e0954ccec204e673ef74a
+_md5_=890a90590ce5f5f437be137f719e0c7d
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index c466bc69fc17..f01fc3b21615 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.501 b/metadata/md5-cache/media-fonts/tex-gyre-2.501
index b2c565aef7ef..40686bac1f97 100644
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.501
+++ b/metadata/md5-cache/media-fonts/tex-gyre-2.501
@@ -4,9 +4,9 @@ DESCRIPTION=Extensive remake of freely available URW fonts
 EAPI=7
 HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~riscv x86
 LICENSE=|| ( GFL LPPL-1.3c )
 SLOT=0
 SRC_URI=http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg2_501otf.zip
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=9f9e629fe543e88b4ed4864937bb16b3
+_md5_=bc2664a3f345ef455c353c6d227dfe84
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 2a756dc902c4..11ff7c0b6b08 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/portaudio-19.07.00-r2 b/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
index d5e8f7d50776..93eaa132d346 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
+++ b/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
 EAPI=7
 HOMEPAGE=http://www.portaudio.com/
 IUSE=alsa +cxx debug doc jack oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) 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(-)?] )
 SLOT=0
 SRC_URI=http://files.portaudio.com/archives/pa_stable_v190700_20210406.tgz https://dev.gentoo.org/~sam/distfiles/media-libs/portaudio/portaudio-19.07.00-audacity.patch.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9250cba6d17777dfe91024685c973501
+_md5_=86dbbefc7bdf0318cdf6a138b986b335
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 4b8bfe5d804e..2a52f1a2a450 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/lilypond-2.23.2 b/metadata/md5-cache/media-sound/lilypond-2.23.2
index 34fae0cf7c39..9d5773104e47 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.23.2
+++ b/metadata/md5-cache/media-sound/lilypond-2.23.2
@@ -5,7 +5,7 @@ DESCRIPTION=GNU Music Typesetter
 EAPI=7
 HOMEPAGE=http://lilypond.org/
 IUSE=debug doc emacs profile vim-syntax l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~x86
 LICENSE=GPL-3 FDL-1.3
 RDEPEND=app-text/ghostscript-gpl dev-scheme/guile:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 x11-libs/pango emacs? ( >=app-editors/emacs-23.1:* ) 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.23/lilypond-2.23.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e442d0839ba6a17ec00ba91df7d02fdb
+_md5_=6e16e9c8470e84020afbd38c361c1d23
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 6894ef999581..e30372ac9407 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/quasselgrep-0_p20200830 b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
index 5cd4fde88ebd..75f4e1e8fc67 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for searching quassel logs from the commandline
 EAPI=7
 HOMEPAGE=https://github.com/fish-face/quasselgrep
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=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/fish-face/quasselgrep/archive/9b6b0bc1252daa6e574363d87d04eebd981215a5.tar.gz -> quasselgrep-0_p20200830.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=606fcb3edd33602305c7d66d68c8c09f
+_md5_=4111fb5aa48c2d2c2eef8b1665b4fe9c
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.2.1.1 b/metadata/md5-cache/net-irc/unrealircd-5.2.1.1
index daaf326105ba..d79a8c7a5e47 100644
--- a/metadata/md5-cache/net-irc/unrealircd-5.2.1.1
+++ b/metadata/md5-cache/net-irc/unrealircd-5.2.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=An advanced Internet Relay Chat daemon
 EAPI=7
 HOMEPAGE=https://www.unrealircd.org/
 IUSE=class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] )
 SLOT=0
 SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.2.1.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=960ede5692328cdc6746840292eff744
+_md5_=fba4912c6eb75b6b4bd49f1eb4640d9a
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 6f4f9cfb8b7f..4abcc731fbce 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/libsearpc-3.2.0-r1 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
index 7e46bf8d0d9e..91a64db5717d 100644
--- a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
+++ b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/libsearpc/archive/v3.2.0.tar.gz -> libsearpc-3.2.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c23d398a91b24c7cb1123c77e44d3758
+_md5_=7d615bd57a8f3bc9a00a4df7ad44b50b
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2 b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
index ece7c27a25a0..576c498319e8 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
+++ b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~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 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/boost:=[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(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/libev-4.15[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.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=36557b997ac2341f131d9ef457ceb544
+_md5_=810f8a0580a502c4af3c09514b52344f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5578c1544046..d298e006ea57 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/seafile-8.0.1 b/metadata/md5-cache/net-misc/seafile-8.0.1
index 747c1dbe5068..4a4f4f99d07d 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.1
+++ b/metadata/md5-cache/net-misc/seafile-8.0.1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v8.0.1.tar.gz -> seafile-8.0.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a0a9ae324a90976d3020d0f584178a0a
+_md5_=403b8b72bead38d75f78a20136c5df00
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.2 b/metadata/md5-cache/net-misc/seafile-8.0.2
index b1b54f822249..b5c030664b28 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.2
+++ b/metadata/md5-cache/net-misc/seafile-8.0.2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/2493113afb174b1a0e6f860512922b69c05cee69.tar.gz -> seafile-8.0.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=02d5a1d753c6d7b79e6a54a65f51ff59
+_md5_=e35bcde064af231d14cb6e49413a412d
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.3 b/metadata/md5-cache/net-misc/seafile-8.0.3
index 956de2d6b809..4edc4fad048d 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.3
+++ b/metadata/md5-cache/net-misc/seafile-8.0.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/303080b54859d0fc55ce693902c95f9620876c1b.tar.gz -> seafile-8.0.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67d682cacae68bf01bc09c55193ab482
+_md5_=5e859a047238fbabb72a743c704f341d
diff --git a/metadata/md5-cache/net-misc/vconfig-1.9 b/metadata/md5-cache/net-misc/vconfig-1.9
index ff57cc66df78..c0d3bff0a59a 100644
--- a/metadata/md5-cache/net-misc/vconfig-1.9
+++ b/metadata/md5-cache/net-misc/vconfig-1.9
@@ -3,9 +3,9 @@ DESCRIPTION=802.1Q vlan control utility
 EAPI=7
 HOMEPAGE=http://www.candelatech.com/~greear/vlan.html
 IUSE=static
-KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.candelatech.com/~greear/vlan/vlan.1.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e90e54e09388eaf0ce41ec615be756d
+_md5_=0a1915124b8ff58932457e63e33e47ef
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index c09c8adc023c..6840de6309ea 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9 b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
index 0bf7ae827851..dbe0adcbe0d6 100644
--- a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
+++ b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
@@ -4,10 +4,10 @@ DESCRIPTION=Transparent SOCKS v4 proxying library
 EAPI=7
 HOMEPAGE=http://tsocks.sourceforge.net/
 IUSE=debug dns envconf tordns server-lookups 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 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 REQUIRED_USE=dns? ( !tordns !server-lookups ) tordns? ( !dns !server-lookups )
 SLOT=0
 SRC_URI=mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( https://dev.gentoo.org/~bircoph/patches/tsocks-1.8b5-tordns1-gentoo-r4.patch.xz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1405f58320a627593b14cdffe3d8d81
+_md5_=232fff860389b325b2575c21227089a3
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 23f4f8d666a1..da87c23a2456 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/b43-fwcutter-019 b/metadata/md5-cache/net-wireless/b43-fwcutter-019
index 2359264e5796..23c2f4365374 100644
--- a/metadata/md5-cache/net-wireless/b43-fwcutter-019
+++ b/metadata/md5-cache/net-wireless/b43-fwcutter-019
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst
-DESCRIPTION=Firmware Tool for Broadcom 43xx based wireless network devices using the mac80211 wireless stack
-EAPI=5
+DESCRIPTION=Firmware tool for Broadcom 43xx-based wireless devices using mac80211
+EAPI=7
 HOMEPAGE=https://bues.ch/b43/fwcutter/
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://bues.ch/b43/fwcutter/b43-fwcutter-019.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88784a3d5247cfdfa9bd732b483651f9
+_md5_=f5d25a8bf57f5ca028e7c8f62e978f67
diff --git a/metadata/md5-cache/net-wireless/iwd-1.15 b/metadata/md5-cache/net-wireless/iwd-1.15
index e4a980621182..f46e4408cf21 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.15
+++ b/metadata/md5-cache/net-wireless/iwd-1.15
@@ -5,10 +5,10 @@ DESCRIPTION=Wireless daemon for linux
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
 IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.41 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.15.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2b74073525a275e5980cdd18d720f858
+_md5_=b2584f4602332fa882cddc2055cc9ce3
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 44f0de76dc09..732249c73255 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/fxload-20081013-r1 b/metadata/md5-cache/sys-apps/fxload-20081013-r1
index 5172437e69b3..ab3fe8616588 100644
--- a/metadata/md5-cache/sys-apps/fxload-20081013-r1
+++ b/metadata/md5-cache/sys-apps/fxload-20081013-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=USB firmware uploader
-EAPI=5
+EAPI=7
 HOMEPAGE=http://linux-hotplug.sourceforge.net/
-KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-hotplug/fxload-2008_10_13.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9e204bce7b643e45e7651e2425750ec
+_md5_=64ecdfa65ee33d1f4c4cd16db0f2bd6f
diff --git a/metadata/md5-cache/sys-apps/memtester-4.5.1 b/metadata/md5-cache/sys-apps/memtester-4.5.1
index be50add8065e..293234bf3247 100644
--- a/metadata/md5-cache/sys-apps/memtester-4.5.1
+++ b/metadata/md5-cache/sys-apps/memtester-4.5.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=userspace utility for testing the memory subsystem for faults
 EAPI=7
 HOMEPAGE=http://pyropus.ca/software/memtester/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://pyropus.ca/software/memtester/memtester-4.5.1.tar.gz http://pyropus.ca/software/memtester/old-versions/memtester-4.5.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=722b3b9dfd64da3823f7b6e211167db1
+_md5_=06aeead1a00c173ee5b99904cb1c2b3a
diff --git a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3 b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
index 7f16787abc38..d7932501bf90 100644
--- a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
+++ b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
@@ -4,9 +4,9 @@ DESCRIPTION=Brings up/down ethernet ports automatically with cable detection
 EAPI=7
 HOMEPAGE=https://www.red-bean.com/~bos/
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.red-bean.com/~bos/netplug/netplug-1.2.9.2.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8fd2d4e63d1feae1709412102c50b7e8
+_md5_=6751444479780871d66dbfedde964a94
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.8 b/metadata/md5-cache/sys-apps/plocate-1.1.8
index ba4724e27619..da766221ddc5 100644
--- a/metadata/md5-cache/sys-apps/plocate-1.1.8
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=Posting locate is a much faster locate
 EAPI=7
 HOMEPAGE=https://plocate.sesse.net/
 IUSE=+io-uring kernel_linux
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2 GPL-2+
 RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
 SLOT=0
 SRC_URI=https://plocate.sesse.net/download/plocate-1.1.8.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_=86b8048e8021b6c0bf6c20c3b9955c1f
+_md5_=2707210b3b4f29b83cf85c138da837f2
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.13 b/metadata/md5-cache/sys-apps/rng-tools-6.13
index 5abd7183a864..a3b84b58af70 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-6.13
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.13
@@ -5,10 +5,10 @@ DESCRIPTION=Daemon to use hardware random number generators
 EAPI=7
 HOMEPAGE=https://github.com/nhorman/rng-tools
 IUSE=jitterentropy nistbeacon pkcs11 selinux
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
 SLOT=0
 SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.13.tar.gz -> rng-tools-6.13.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=65848381dcf3338c38cd68b0977408f8
+_md5_=e2285f9bcfed388fb3c4b318d3d3622a
diff --git a/metadata/md5-cache/sys-apps/sdparm-1.12 b/metadata/md5-cache/sys-apps/sdparm-1.12
index 1ce811bdd863..2bf14c2ded7f 100644
--- a/metadata/md5-cache/sys-apps/sdparm-1.12
+++ b/metadata/md5-cache/sys-apps/sdparm-1.12
@@ -3,9 +3,9 @@ DEPEND=>=sys-apps/sg3_utils-1.45:0=
 DESCRIPTION=Utility to output and modify parameters on a SCSI device, like hdparm
 EAPI=7
 HOMEPAGE=http://sg.danny.cz/sg/sdparm.html
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sys-apps/sg3_utils-1.45:0=
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/sdparm-1.12.tgz
-_md5_=40a0ee8a17dd4c78d8570ed7c559a2f0
+_md5_=0c76f7637292155107e70acad889a793
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index d2d79a00b191..9e0aff34cb6c 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/partimage-0.6.9-r2 b/metadata/md5-cache/sys-block/partimage-0.6.9-r2
index 9a011a6373ec..b0e5a324e009 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.9-r2
+++ b/metadata/md5-cache/sys-block/partimage-0.6.9-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Console-based application to efficiently save raw partition data to
 EAPI=6
 HOMEPAGE=http://www.partimage.org/
 IUSE=nls nologin pam ssl static
-KEYWORDS=amd64 ppc ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( pam? ( sys-libs/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= !nologin? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c93b483e92d18b43b7a5776692a6590
+_md5_=ba1b05168d052a5887f60205ef595893
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 02372edc10d2..27d81d17bcab 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/quotatool-1.6.2 b/metadata/md5-cache/sys-fs/quotatool-1.6.2
index f363815e8c5b..b1a32db91ed9 100644
--- a/metadata/md5-cache/sys-fs/quotatool-1.6.2
+++ b/metadata/md5-cache/sys-fs/quotatool-1.6.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Command-line utility for filesystem quotas
 EAPI=7
 HOMEPAGE=http://quotatool.ekenberg.se/
-KEYWORDS=~amd64 ~arm64 ppc x86
+KEYWORDS=~amd64 ~arm ~arm64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/quota
 SLOT=0
 SRC_URI=http://quotatool.ekenberg.se/quotatool-1.6.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0d2c5479b73edb696a6dba45b6e1da5a
+_md5_=30c3c5c8c08d7ded465e148cfe58448b
diff --git a/metadata/md5-cache/sys-fs/xfsdump-3.1.9 b/metadata/md5-cache/sys-fs/xfsdump-3.1.9
index 1443a8c6f1e0..d7ddfc20452e 100644
--- a/metadata/md5-cache/sys-fs/xfsdump-3.1.9
+++ b/metadata/md5-cache/sys-fs/xfsdump-3.1.9
@@ -5,10 +5,10 @@ DESCRIPTION=xfs dump/restore utilities
 EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
 IUSE=ncurses nls
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/attr-2.4.19 sys-apps/dmapi sys-apps/util-linux sys-fs/e2fsprogs >=sys-fs/xfsprogs-3.2.0 ncurses? ( sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/xfsdump-3.1.9.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=080f850511cdb5a3bb71f05917dacab1
+_md5_=7b2a8e3c55a9635b1e3ac3eff720a503
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 488796384754..2cc1dc97cd02 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.53-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.53-r1
new file mode 100644
index 000000000000..d646c554bdae
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.53-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.53
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.53 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.53
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-59.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-59.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.53-1.xpak -> gentoo-kernel-5.10.53-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.4-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.4-r1
new file mode 100644
index 000000000000..cb58e5f1c03c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.4
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.4
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-6.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.4-1.xpak -> gentoo-kernel-5.13.4-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=96edffee181c4bdb22258f1a4cc4cd8f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.135-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.135-r1
new file mode 100644
index 000000000000..3267fbc5852a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.135-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.135
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.135 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.135
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-139.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-139.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.135-1.xpak -> gentoo-kernel-5.4.135-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e859bb4bad72..6d1d267bc780 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/schedtool-1.3.0-r1 b/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
index cf46a9ace7f1..270a141b03c3 100644
--- a/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
+++ b/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A tool to query or alter a process' scheduling policy
 EAPI=7
 HOMEPAGE=https://github.com/freequaos/schedtool
-KEYWORDS=amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/freequaos/schedtool/archive/schedtool-1.3.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=963cee6154a162affa93960896d8d6a6
+_md5_=4276fbdc5b4139328c0c41240298e328
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 438aa7615479..afedfab45bf1 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/imagemagick-tools-0 b/metadata/md5-cache/virtual/imagemagick-tools-0
index 282a0f6ff4a5..86c634c6fa39 100644
--- a/metadata/md5-cache/virtual/imagemagick-tools-0
+++ b/metadata/md5-cache/virtual/imagemagick-tools-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for imagemagick command line tools
 EAPI=6
 IUSE=jpeg perl png svg tiff
-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
+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
 RDEPEND=|| ( media-gfx/imagemagick[jpeg?,perl?,png?,svg?,tiff?] media-gfx/graphicsmagick[imagemagick,jpeg?,perl?,png?,svg?,tiff?] )
 SLOT=0
-_md5_=dfcce6e848bfb0c7fb87f5ebc1bc3fcc
+_md5_=dbedcaaa609a6a1e40968a7fd5b66796
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d4e5aefc6151..1a66dfccd395 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4557.4 b/metadata/md5-cache/www-client/chromium-93.0.4557.4
deleted file mode 100644
index 6e9dcfb6de24..000000000000
--- a/metadata/md5-cache/www-client/chromium-93.0.4557.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4557.4.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-5/chromium-93-patchset-5.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5b237dffa391ebf033bf5094442cd43b
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4577.8 b/metadata/md5-cache/www-client/chromium-93.0.4577.8
new file mode 100644
index 000000000000..09ade7adfdcc
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-93.0.4577.8
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4577.8.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-6/chromium-93-patchset-6.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b4459591b4f08ab154f78c1e0da09953
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2352.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2367.3
similarity index 93%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2352.3
rename to metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2367.3
index f3bef62405c5..6582e13912c5 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2352.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2367.3
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2352.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2352.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2352.3-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2367.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2367.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2367.3-1_arm64.deb )
 _eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 3ae75ee757b9..ecb068a15704 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.2 b/metadata/md5-cache/x11-base/xwayland-21.1.2
new file mode 100644
index 000000000000..caef3566b5ad
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-21.1.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl,gbm] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
+DESCRIPTION=Standalone X server running under Wayland
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/xserver.html
+IUSE=rpc unwind ipv6 xcsecurity selinux video_cards_nvidia
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl,gbm] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=369ec7932b07dd8ff182a237684018bb
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index d3318f5bc93b..9947131d6eaa 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2 b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
new file mode 100644
index 000000000000..3be096247ea1
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) pam? ( sys-libs/pam ) policykit? ( sys-auth/polkit ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( || ( dev-libs/efl[systemd] dev-libs/efl[elogind] ) dev-libs/efl[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xwayland )
+DESCRIPTION=Enlightenment window manager
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org
+IUSE=acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) pam? ( sys-libs/pam ) policykit? ( sys-auth/polkit ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( || ( dev-libs/efl[systemd] dev-libs/efl[elogind] ) dev-libs/efl[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xwayland )
+REQUIRED_USE=xwayland? ( wayland )
+SLOT=0.17/0.24.2
+SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5e5bc157195e244b279f744acb9b4229
diff --git a/metadata/md5-cache/x11-wm/mutter-40.3 b/metadata/md5-cache/x11-wm/mutter-40.3-r1
similarity index 81%
rename from metadata/md5-cache/x11-wm/mutter-40.3
rename to metadata/md5-cache/x11-wm/mutter-40.3-r1
index ea089c08817e..af6b85b43db3 100644
--- a/metadata/md5-cache/x11-wm/mutter-40.3
+++ b/metadata/md5-cache/x11-wm/mutter-40.3-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-libs/wayland dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 || ( x11-libs/libxcvt <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME compositing window manager based on Clutter
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
+RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/mutter/40/mutter-40.3.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	udev	26207b5d4f4708920b9fcb7302d94068	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a09dbdb7179c208bb9c9d383fff57354
+_md5_=6e52411668dfdcb00c3765f0bd7c2e5f
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index a5730a494a33..b71dbfe07934 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-sensors-plugin-1.4.1 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.1
new file mode 100644
index 000000000000..3afc875efca5
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+DESCRIPTION=A panel plug-in for acpi, lm-sensors and hddtemp sensors
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
+IUSE=+acpi hddtemp libnotify lm-sensors video_cards_nvidia
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+REQUIRED_USE=|| ( hddtemp lm-sensors acpi )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.1.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7c355033235f7ac016a2c969031b7847
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1726b1c2268d..1c93ad7b446e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jul 2021 19:09:04 +0000
+Tue, 27 Jul 2021 04:39:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fcdffca28555..b74e9ffac7bf 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jul 26 07:09:04 PM UTC 2021
+Tue Jul 27 04:39:08 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5f5879304882..9836f8a1c679 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jul 2021 19:30:01 +0000
+Tue, 27 Jul 2021 05:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9503cbb0b899..d392c7eea34e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d3f0dff6bf0815b6ebb24edb3e837eca5bbf4449 1627323130 2021-07-26T18:12:10+00:00
+598ea7ea0f723e40acc18e22762a3a0c78af7aea 1627358086 2021-07-27T03:54:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f1dfa9a51936..b567250ec091 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1627326301 Mon 26 Jul 2021 07:05:01 PM UTC
+1627360501 Tue 27 Jul 2021 04:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1726b1c2268d..1c93ad7b446e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jul 2021 19:09:04 +0000
+Tue, 27 Jul 2021 04:39:08 +0000
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 042a459f735d..4a60f9430016 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
index 2a17d4e0303d..2e651cfc5a8b 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20200830.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
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/fish-face/quasselgrep"
 MY_COMMIT="9b6b0bc1252daa6e574363d87d04eebd981215a5"
 SRC_URI="https://github.com/fish-face/quasselgrep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild b/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild
index 153eb5e22392..74c8cc72c471 100644
--- a/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes"
 
 RDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2d17bad44b15..9801723fd645 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index c3cd310e52b5..ca9505393e11 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -35,6 +35,6 @@ src_prepare() {
 
 src_install() {
 	default
-	# Remove unnecessary .la and .a files, as recommended by ltprune.eclass
+	# Remove unnecessary .la and .a files
 	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 }
diff --git a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
index a9b6c8436182..5b3804479109 100644
--- a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-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 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 06606689b6be..46fdece83a3b 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/seafile/seafile-8.0.1.ebuild b/net-misc/seafile/seafile-8.0.1.ebuild
index 891aaaa47dd8..ffc82290de46 100644
--- a/net-misc/seafile/seafile-8.0.1.ebuild
+++ b/net-misc/seafile/seafile-8.0.1.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 
 src_install() {
 	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	# Remove unnecessary .la files
 	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 	python_fix_shebang "${ED}"/usr/bin
 }
diff --git a/net-misc/seafile/seafile-8.0.2.ebuild b/net-misc/seafile/seafile-8.0.2.ebuild
index 04c6660122f2..53ed66a1dc80 100644
--- a/net-misc/seafile/seafile-8.0.2.ebuild
+++ b/net-misc/seafile/seafile-8.0.2.ebuild
@@ -46,7 +46,7 @@ src_prepare() {
 
 src_install() {
 	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	# Remove unnecessary .la files
 	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 	python_fix_shebang "${ED}"/usr/bin
 }
diff --git a/net-misc/seafile/seafile-8.0.3.ebuild b/net-misc/seafile/seafile-8.0.3.ebuild
index 1506b7efd429..e9ac6acd1fa8 100644
--- a/net-misc/seafile/seafile-8.0.3.ebuild
+++ b/net-misc/seafile/seafile-8.0.3.ebuild
@@ -51,7 +51,7 @@ src_configure() {
 
 src_install() {
 	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	# Remove unnecessary .la files
 	find "${ED}" -name '*.la' -delete || die
 	python_fix_shebang "${ED}"/usr/bin/seaf-cli
 }
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
index 3eec5302806b..4465fa242db2 100644
--- a/net-misc/vconfig/vconfig-1.9.ebuild
+++ b/net-misc/vconfig/vconfig-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="static"
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d08a4847d33d..1950a8b36de7 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
index d2a536487035..ee6664e1f6a0 100644
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r9.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="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
 IUSE="debug dns envconf tordns server-lookups"
 
 REQUIRED_USE="
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 6574f87b30d3..aea3bbaa8052 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
index e41a6f640627..6c2f27dd0aa7 100644
--- a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
+++ b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="Firmware Tool for Broadcom 43xx based wireless network devices
-using the mac80211 wireless stack"
+DESCRIPTION="Firmware tool for Broadcom 43xx-based wireless devices using mac80211"
 HOMEPAGE="https://bues.ch/b43/fwcutter/"
 SRC_URI="https://bues.ch/b43/fwcutter/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 src_compile() {
-	MAKEOPTS+=" V=1"
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" V=1
 }
 
 src_install() {
@@ -28,8 +25,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
 	einfo "Firmware may be downloaded from http://linuxwireless.org."
 	einfo "This version of fwcutter works with all b43 driver versions."
-	echo
 }
diff --git a/net-wireless/iwd/iwd-1.15.ebuild b/net-wireless/iwd/iwd-1.15.ebuild
index 335f2cb05d59..a8b6a3dcbdd9 100644
--- a/net-wireless/iwd/iwd-1.15.ebuild
+++ b/net-wireless/iwd/iwd-1.15.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 702da019028f..0d0616bf9889 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 52e91e9fc90f..5b596bbdb5c0 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -7,7 +7,7 @@ kde-frameworks/solid ios
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-07-22)
 # dependencies not keyworded/not tested
-dev-qt/qtnetwork networkmanager connman
+dev-qt/qtnetwork networkmanager
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-20)
 # sys-auth/sssd and its deps not keyworded yet
@@ -153,10 +153,7 @@ dev-libs/libpcre jit
 # This includes also packages which do not support python-3 or
 # do not support python-3.7 yet.
 
-app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp test
-app-arch/p7zip wxwidgets
-app-text/asciidoc test
-dev-libs/libgcrypt doc
+app-admin/syslog-ng mongodb test
 dev-python/argcomplete test
 dev-python/aiohttp doc test
 dev-python/jinja doc
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 20166498093c..9514291d437c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1550,7 +1550,6 @@ dev-haskell/rfc5051:mkunicodedata - build codes generator itself
 dev-haskell/sandi:conduit - Build with conduit
 dev-haskell/semigroupoid-extras:profunctors - You can disable the use of the `profunctors` package using `-f-profunctors`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/semigroupoids:comonad - You can disable the use of the `comonad` package using `-f-comonad`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Comonad`
-dev-haskell/semigroupoids:containers - You can disable the use of the `containers` package using `-f-containers`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/semigroupoids:contravariant - You can disable the use of the `contravariant` package using `-f-contravariant`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Contravariant`
 dev-haskell/semigroupoids:distributive - You can disable the use of the `distributive` package using `-f-distributive`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Distributive`
 dev-haskell/semigroupoids:tagged - You can disable the use of the `tagged` package using `-f-tagged`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e2fa4ac9c182..151ef4d9253a 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fxload/fxload-20081013-r1.ebuild b/sys-apps/fxload/fxload-20081013-r1.ebuild
index e5da4db9cfe4..c934c82104a2 100644
--- a/sys-apps/fxload/fxload-20081013-r1.ebuild
+++ b/sys-apps/fxload/fxload-20081013-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -10,17 +10,17 @@ MY_P="${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}"
 DESCRIPTION="USB firmware uploader"
 HOMEPAGE="http://linux-hotplug.sourceforge.net/"
 SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 src_prepare() {
+	default
+
 	sed -i \
-		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:' \
+		-e 's:$(CC) -o:$(CC) $(CPPFLAGS) $(LDFLAGS) -o:' \
 		Makefile || die
 }
 
diff --git a/sys-apps/memtester/memtester-4.5.1.ebuild b/sys-apps/memtester/memtester-4.5.1.ebuild
index 2084213eb705..f4e51b6711df 100644
--- a/sys-apps/memtester/memtester-4.5.1.ebuild
+++ b/sys-apps/memtester/memtester-4.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
index a452c1ad1c3d..41043cb0afdc 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 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="https://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc"
 
 DEPEND="doc? ( app-text/ghostscript-gpl
diff --git a/sys-apps/plocate/plocate-1.1.8.ebuild b/sys-apps/plocate/plocate-1.1.8.ebuild
index a708c02300a6..8a72a64c26d8 100644
--- a/sys-apps/plocate/plocate-1.1.8.ebuild
+++ b/sys-apps/plocate/plocate-1.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/rng-tools/rng-tools-6.13.ebuild b/sys-apps/rng-tools/rng-tools-6.13.ebuild
index efcad08959ac..a053373f0109 100644
--- a/sys-apps/rng-tools/rng-tools-6.13.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
diff --git a/sys-apps/sdparm/sdparm-1.12.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild
index 3a51faebd89d..c89c04cefa04 100644
--- a/sys-apps/sdparm/sdparm-1.12.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ff8596e97120..97df54f26709 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/partimage/partimage-0.6.9-r2.ebuild b/sys-block/partimage/partimage-0.6.9-r2.ebuild
index e2fe1d3a98af..e747631d8dc5 100644
--- a/sys-block/partimage/partimage-0.6.9-r2.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
 IUSE="nls nologin pam ssl static"
 
 LIBS_DEPEND="app-arch/bzip2
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index cb7c518d4a19..04bfff39b1ad 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/quotatool/quotatool-1.6.2.ebuild b/sys-fs/quotatool/quotatool-1.6.2.ebuild
index 9b99317ab367..ce3c5a6fcfb6 100644
--- a/sys-fs/quotatool/quotatool-1.6.2.ebuild
+++ b/sys-fs/quotatool/quotatool-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://quotatool.ekenberg.se/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc x86"
 
 RDEPEND="sys-fs/quota"
 
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
index 57fc455d91cb..fd7f18bc427d 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="ncurses nls"
 
 RDEPEND="
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f9c0f6da600f..23446911426c 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index cd7054cf325b..fb1c9ce1e63e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,10 +16,12 @@ DIST gentoo-kernel-5.10.52-1.amd64.xpak 65489696 BLAKE2B a2db9e17da673f174515c38
 DIST gentoo-kernel-5.10.52-1.arm64.xpak 59035661 BLAKE2B b6084e13be321a59402a79ece7bc3c302b1b49e4a0ab24ac456185590fa8c5a555833db68ddebd1905da4bffce3b8f7ad17b86bcf882cdb839d88c8d4d135912 SHA512 1853c88f26a1d2d26b67a37cb40faaab6ef9b4af7ac77fc1b83d0b6603c1addf299f58e34a5608e6a056aeb81d0e9c2058fd1eee056f5f150cf4507327d6c8f2
 DIST gentoo-kernel-5.10.52-1.x86.xpak 57220562 BLAKE2B 89a0555e23ba7c5493b1d3865665497f821d7a256166cc4a92e5854fc506ca8aa5b883b84f4a97771934fc6ac5d61b1a213aaa66767e1881a487db5ca6dee216 SHA512 a12657010017d2d2ae317ad234b8f114daca90f94eab0cd42e3776fa7d6d933b8c8ab507412b43a11aada62a863993f63243c56dd906b4b85796f968dfcd2ca9
 DIST gentoo-kernel-5.10.53-1.amd64.xpak 65475491 BLAKE2B 0697c8449ac103de265c28bb8c0b7c0e73dc95a23d8e6b8e28cf86c86206842165429a5c1b2cb774b314053f12ea9c3897f5929623d22bb33931c606a9746c43 SHA512 ad5d44512bbd09a35197ddf0f8e26f812d8332bb090aa1036c998a2ec623fa4cb068f7129068fad35872765a39b447e78a769b7c429c8c548f717fda1eb19099
+DIST gentoo-kernel-5.10.53-1.arm64.xpak 61215071 BLAKE2B 8a912d6167bd64d8194973f50e3298ed125a5fa8396d3e7a23749cbb8daa2433c490f819971c783a9291ab19eec306b79db6494907936cabaebfc5ca725859b9 SHA512 872b3bfa2e1d5d61eca2ed228c79122b6b7e9bb4cc00f6be2d46ad6fd5c2aa6534a26a6e7763ad3605bbfc3fd572f1d3636b7baf8c10da0652d707a0749aa870
 DIST gentoo-kernel-5.10.53-1.x86.xpak 57218618 BLAKE2B b4948e9bd942e78d079607f4cc9611dae32b78ad2fa60245466e9b556433fb58db2c5c2709d2cb85762176c9fbbe26aeaa7dfae1cac2b7f8bdb10dc4ec243701 SHA512 6c2aaa43dfb99e28059333e43f3756b1405fa76847c19a0b7f52ed71328cb52541c66c1fb3335947e303f0c4c739d32b44598f56616a63fc0e1d8fd4a05dfb6e
 DIST gentoo-kernel-5.12.19-1.amd64.xpak 66346655 BLAKE2B a03cbcdcd1a90d48d7e11e988d03efa43980f4d5d8af4b74e4c81f195faa01803af45fb38f7dc1f5af7e9b5338a53bc6f34837c37f7e853c088ec6c1dc084e44 SHA512 3d7f78c488ecee2532f8a8ad61e3aa0f5e238e4cd520d29288715a3dc5c488670d7378f3dc5bc110252dff10108dfbda27a54722c6b044151999428d002b34e1
 DIST gentoo-kernel-5.12.19-1.arm64.xpak 60043529 BLAKE2B 8746081847a39e1847b8e9f35fcd68565370b116d6418edf803c4cdca9d750ac8ada58c4a7fd377480a1c75b3c805864d419c02ee21675bc77ac195731385a18 SHA512 d1a8a9210a1ab3d3c1894be1fe524e64b859b0a02763feacfed1a24655540ade6c28af751b23e924fcc04fb9abd56e84c43d634ad80bbb4d5de79ed533b5ea50
 DIST gentoo-kernel-5.12.19-1.x86.xpak 58076509 BLAKE2B 0e4aca91c834b23fb169bb6fabab13130de811c15f89e6341ad2a36ac230071ced6c6d7bd30be0f0f3860d09968449c1933cd33ed021213c667304070b80f9a7 SHA512 9786f106ed59661546d9f035e25c39f4c7a4a41f51afa96700867e47bab19e148e8a42c79bc3b7780967c2f82f1fef6920f220fb5fccd6f267a2c6e6a3081126
+DIST gentoo-kernel-5.13.4-1.arm64.xpak 62698454 BLAKE2B 110da7beab919c6a3c95cae947afa030cb4aa9483fbe39f416a7ef391c70904f99f129089b7b7b5c197b2372cabebe751f5451b7daa7544153e8cb6c7c2dcb3b SHA512 e8b7a6250fbb9b71af6eb58926d7127bf48df1dc1cd669089723c3b9641dc71df15072b3e973a6d75ec053cbe0b7aad4bfa8da67544f564fe095a93fbc35e5c6
 DIST gentoo-kernel-5.13.4-2.amd64.xpak 67284746 BLAKE2B 945d5bb6271142f32f421702969ebffe70ca5232f54bd8a1b48a559971510eb623e7a9b803b044cd17273d27606ad37744e8fbd2812cacf46973f3152ee91939 SHA512 af4cb262af32136138754401682de9f7c781929a0a950d2453738300025b06973a3001d1f2c23496e04a3367f12e07ef897ff858ca9325de59309924c04fdc98
 DIST gentoo-kernel-5.13.4-2.x86.xpak 58486426 BLAKE2B b27a59ce5344db5dd255c831a0752a6a2489611e134891d04040023dbc90d3c7bb49e27762efd0ded4ab95a35f92abc48d051d8e65dc4b620ef74bdce9a93ef0 SHA512 2375c524589c509a0025a92842497674b79b791280a115c14a85d8ea5ad97e595c83efbe91ccfe3ebec098444ad4f299d889f97edc953f8122e70251da228139
 DIST gentoo-kernel-5.13.5-1.amd64.xpak 67289943 BLAKE2B 4a176cb85c9a62555ffe8ce685742869010cee77f24eaf2dc01e77e107e3def9d63f2f452ae59ea0e915749513c3202b8d095ec07ae37fee2b45bc357c10be8b SHA512 728b51346674a20576ad7aad870268112794608b75da1917fb846b6e18c44bfd705f29b5b2baa83e8aba3ca6438648cda8d45978edef1ca2657a07451ddd7a4e
@@ -28,6 +30,7 @@ DIST gentoo-kernel-5.4.134-1.amd64.xpak 61349154 BLAKE2B c7627b1a8ad85b22450ae1b
 DIST gentoo-kernel-5.4.134-1.arm64.xpak 56052116 BLAKE2B 6a901fb6a639470145c8b58e435cfe4a380ebd402397ca34eace732936fda8e38a8e92e0f49d747e6f1ae8fb5410960e236ea2cc22dbc7f25ac833275b9b6fea SHA512 216287843b7d1e740afa3c88376e5d5ae99d88882b6669c753fdd341d7f9cd84ee8cbf28fb08f6101b9a9263ce20c6ddeeececf078c7387e571eac53baa52204
 DIST gentoo-kernel-5.4.134-1.x86.xpak 53144418 BLAKE2B d11e4de3fddb270cc41c9ad49c048df0af8e578f9ef0d811dbc4d930c7b399b7bfff724db889e3e8ce9332920b5f736594923646f7c1c8eb9f07371a85f0a1c9 SHA512 7fc2a72b5f7b636312ff28a2beb07a4514093499bb498bd43574cfd5178490c94628391acfb0da1c08569cbe0cc629373a1b9828398418f82c1745961c6508e1
 DIST gentoo-kernel-5.4.135-1.amd64.xpak 61365037 BLAKE2B 40eee7098546c0adddef5ac39312063c7df55231af0d1124f2d6cc850e5caba567bafc423d1385049a85eee75e4dece9f9500e71087aed7981832e0113cedb3e SHA512 0959a1d870248fb6c62b2f83eb698b143a4d1771c3005d4fb8e8bc926b343b29e59eb45e5b5d4e633aa0f704e8c2bd64f7975ae75814209c2edb29547e92c90f
+DIST gentoo-kernel-5.4.135-1.arm64.xpak 58020226 BLAKE2B cbce1061818daa8949ac926bad8b7e5162029ff6c21e51e90ada2f3353304c4fa68bca02cd5910ab2a089997ca6c85e601196f947ea2f0b572433b14e062e067 SHA512 971a4f99526cadf9dc5d6a13c48399c1fc3dbb57e859594b6efe6d423136405631b231563582cd282732a259574b1b8f11e8c2631c578d93c3057dcadeba3e1d
 DIST gentoo-kernel-5.4.135-1.x86.xpak 53141492 BLAKE2B 501bc60cd72cab3bfae35ef59989e4c0136d90032989a9ed6a13c2a63f2ec21e6925ea56058dd2799fd037ee89d95bcc3541d5857be5d664bba71a668f40afff SHA512 479720b66fd004a3ce5baf25f0ac3564b5f8f980c473cf31dd64deba243a9862d931b195b52c09e62f9ee6e2a3bd2b4e632d93b4632fdd52f6338f018254c461
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.53-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.53-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.53-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.4-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.4-r1.ebuild
new file mode 100644
index 000000000000..2f16601a52d9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.4-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.135-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.135-r1.ebuild
new file mode 100644
index 000000000000..fe6e6023d323
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.135-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 0a80da8d1eab..5cad0f304bbf 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild b/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
index 017d037f387b..e0eceb7e4b5e 100644
--- a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
+++ b/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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="https://github.com/freequaos/schedtool/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT=0
-KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${P}"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 36557c4628a9..ef6966dc18f9 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/imagemagick-tools/imagemagick-tools-0.ebuild b/virtual/imagemagick-tools/imagemagick-tools-0.ebuild
index ee794ef24074..b87e4188527b 100644
--- a/virtual/imagemagick-tools/imagemagick-tools-0.ebuild
+++ b/virtual/imagemagick-tools/imagemagick-tools-0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for imagemagick command line tools"
 SLOT="0"
-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"
+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="jpeg perl png svg tiff"
 
 # This virtual is to be used **ONLY** for depending on the runtime
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a3cb90b424ed..5523d2692b6f 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a238f1b3018c..17bdadfd4989 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -5,7 +5,7 @@ DIST chromium-92-glibc-2.33-patch.tar.xz 12636 BLAKE2B 0621d2135c1a0864374010c36
 DIST chromium-92-patchset-7.tar.xz 4004 BLAKE2B 8587663a072eb08abacbc2e54924855f29efefdbec46acf5cb8b0cc40b816b96ba7694c4ab1abe997572a6dbecf94ea27f368a7337263adfff44f2b4b042d862 SHA512 65c8267ab0921719c71d4b03a4315bbb1ceec35ce4794de9dcc6099b2c349baf4782b67316ebb8c9db233630b7fc89fa0baf719f9f0f41eb39972cdeb437e612
 DIST chromium-92-ppc64le-1.tar.xz 30416 BLAKE2B e953e3ba1ac0ff4bae437328eb1c52fb3863007ff92db91c6858c8c5f7b4c5c39fb8bf6898c3385c7faa82666f1a18aae7fcb5379b9199e58c5c0526fbd9dbee SHA512 b5a20076a34705c53c56d7763189ebfd860a456ca544a7f0c9ce30c877be92270ea724f1bebb9b597b301def27dde0a672b0c30e16e6abbf958cecfd60b07ec5
 DIST chromium-92.0.4515.107.tar.xz 957809240 BLAKE2B 61f34c6de424dbc0bed4a3f6ede42c936389e3280ffccc6db8750674fc512257120fad4006bf5e31701cfebf9cd12df96bb2936296293312317dee85748bf773 SHA512 8814a3371e38836cee02178fa06bee612d00efe561791278351ef5312f5225742d416043fe6e25e9e353ae3d82dbd5ef57c9b1f115423da6537288e9aece779a
-DIST chromium-93-patchset-5.tar.xz 4404 BLAKE2B f347a66c5767bb03dd6a0feda433f51f5110e0429c6f55494000bd1a61a4f3b6a218e7f12ce91a02adae94ee0a85d0aceb12aef5a0537e9362f23817edb662c0 SHA512 39d3bd5ad51e33d5d82a42d5289ab137bdb3280e4d2d647fce86eb59d14a01e9f31531cf82ba9055168c18d1fb96e3013e2d40dc89b30c725c89241d34b7b25d
-DIST chromium-93.0.4557.4.tar.xz 1034639148 BLAKE2B d515e5be84f63bd21e757750963188390bc1b888aeb50a1b7767805784e6efce1c89f058fe5bcdf73a8790677a2b76cd3f01cc6df1b245996924ae46e91911d6 SHA512 b5b214d639becdfdb4a6bd2ee04c9556ee4eca0e436ed6580c8e6d9e5a37476ae1fa208eef741aa8d8535f30f1e751041aaf02fff57dbd685341d7b5866a81cc
+DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca79de6c7ee64299dff20f91cb774af676ec3d95d809b4fc5f7bd663c3b8c904a46ac9cd3ec70a5ce248456dcd48834932 SHA512 eaf0d2bc29c53c7021ccded9c14463bbde2887926c069154c0126ee1bf513bf41a38eeb3dc21023a2e9637ce3e1e541a3b2a79a990bb8becae0da0a04e57c76a
+DIST chromium-93.0.4577.8.tar.xz 1041484708 BLAKE2B 7978b7771c9e964efc28e691fc16e7b0679372ef86d7477327f40e8f7682638606e88711cce438f12616011e1e3bc4ad2d0b9be741a409cc8001a78f0632c0a7 SHA512 8940dee8186244bca134b83a452a7d2668d2a382ef32034cf4b7e8c781d709c679418e4fc97f744f14d10f8bdf0d9104eaadbd32efd0dce43d600b4cf5b933e4
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-93.0.4557.4.ebuild b/www-client/chromium/chromium-93.0.4577.8.ebuild
similarity index 98%
rename from www-client/chromium/chromium-93.0.4557.4.ebuild
rename to www-client/chromium/chromium-93.0.4577.8.ebuild
index 206632b872e6..8bcd0f7a8121 100644
--- a/www-client/chromium/chromium-93.0.4557.4.ebuild
+++ b/www-client/chromium/chromium-93.0.4577.8.ebuild
@@ -13,10 +13,11 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="5"
+PATCHSET="6"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	https://dev.gentoo.org/~sultan/distfiles/www-client/${PN}/${PN}-92-glibc-2.33-patch.tar.xz
 	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )"
 
 LICENSE="BSD"
@@ -55,7 +56,7 @@ COMMON_DEPEND="
 	>=dev-libs/nss-3.26:=
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/fontconfig:=
-	media-libs/freetype:=
+	>=media-libs/freetype-2.11.0:=
 	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
@@ -232,22 +233,14 @@ src_prepare() {
 
 	local PATCHES=(
 		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-92-EnumTable-crash.patch"
+		"${WORKDIR}/sandbox-patches/chromium-syscall_broker.patch"
+		"${WORKDIR}/sandbox-patches/chromium-fstatat-crash.patch"
+		"${FILESDIR}/chromium-92-GetUsableSize-nullptr.patch"
+		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
-	# seccomp sandbox is broken if compiled against >=sys-libs/glibc-2.33, bug #769989
-	if has_version -d ">=sys-libs/glibc-2.33"; then
-		ewarn "Adding experimental glibc-2.33 sandbox patch. Seccomp sandbox might"
-		ewarn "still not work correctly. In case of issues, try to disable seccomp"
-		ewarn "sandbox by adding --disable-seccomp-filter-sandbox to CHROMIUM_FLAGS"
-		ewarn "in /etc/chromium/default."
-		PATCHES+=(
-			"${FILESDIR}/chromium-glibc-2.33.patch"
-		)
-	fi
-
 	default
 
 	mkdir -p third_party/node/linux/node-linux-x64/bin || die
diff --git a/www-client/chromium/files/chromium-93-EnumTable-crash.patch b/www-client/chromium/files/chromium-93-EnumTable-crash.patch
new file mode 100644
index 000000000000..a5c2defa0ae2
--- /dev/null
+++ b/www-client/chromium/files/chromium-93-EnumTable-crash.patch
@@ -0,0 +1,79 @@
+diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
+index a63ae86..83ada65 100644
+--- a/components/cast_channel/enum_table.h
++++ b/components/cast_channel/enum_table.h
+@@ -8,6 +8,7 @@
+ #include <cstdint>
+ #include <cstring>
+ #include <ostream>
++#include <vector>
+ 
+ #include "base/check_op.h"
+ #include "base/macros.h"
+@@ -213,7 +214,7 @@ class
+ 
+   template <typename E>
+   friend class EnumTable;
+-  DISALLOW_COPY_AND_ASSIGN(GenericEnumTableEntry);
++  DISALLOW_ASSIGN(GenericEnumTableEntry);
+ };
+ 
+ // Yes, these constructors really needs to be inlined.  Even though they look
+@@ -251,8 +252,7 @@ class EnumTable {
+     // Constructor for regular entries.
+     constexpr Entry(E value, base::StringPiece str)
+         : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
+-
+-    DISALLOW_COPY_AND_ASSIGN(Entry);
++    DISALLOW_ASSIGN(Entry);
+   };
+ 
+   static_assert(sizeof(E) <= sizeof(int32_t),
+@@ -307,15 +307,14 @@ class EnumTable {
+     if (is_sorted_) {
+       const std::size_t index = static_cast<std::size_t>(value);
+       if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
+-        const auto& entry = data_.begin()[index];
++        const auto& entry = data_[index];
+         if (ANALYZER_ASSUME_TRUE(entry.has_str()))
+           return entry.str();
+       }
+       return absl::nullopt;
+     }
+     return GenericEnumTableEntry::FindByValue(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), static_cast<int32_t>(value));
++        &data_[0], data_.size(), static_cast<int32_t>(value));
+   }
+ 
+   // This overload of GetString is designed for cases where the argument is a
+@@ -343,8 +342,7 @@ class EnumTable {
+   // enum value directly.
+   absl::optional<E> GetEnum(base::StringPiece str) const {
+     auto* entry = GenericEnumTableEntry::FindByString(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), str);
++        &data_[0], data_.size(), str);
+     return entry ? static_cast<E>(entry->value) : absl::optional<E>();
+   }
+ 
+@@ -359,7 +357,7 @@ class EnumTable {
+   // Align the data on a cache line boundary.
+   alignas(64)
+ #endif
+-      std::initializer_list<Entry> data_;
++      const std::vector<Entry> data_;
+   bool is_sorted_;
+ 
+   constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
+@@ -371,8 +369,8 @@ class EnumTable {
+ 
+     for (std::size_t i = 0; i < data.size(); i++) {
+       for (std::size_t j = i + 1; j < data.size(); j++) {
+-        const Entry& ei = data.begin()[i];
+-        const Entry& ej = data.begin()[j];
++        const Entry& ei = data[i];
++        const Entry& ej = data[j];
+         DCHECK(ei.value != ej.value)
+             << "Found duplicate enum values at indices " << i << " and " << j;
+         DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index dad8f3a028f5..6cd57a196a59 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-snapshot_4.1.2352.3-1_amd64.deb 85091424 BLAKE2B c5d0211ae23e3d46281860ec1d896a7705300203b6ef0d7dfc95457376daf54dc027081ba8dd9e689a7781d4002c9932a8c1822bf7fe69ac878f4c80b22d5fd1 SHA512 c8f9d891d001bd5a0b05155b1f71cf8083c940936c2a42447aa3367a3e87ae35e787f5ea594bd26b7b34a7ec64a8d47d7a3427636c6d1f1f5259a08a7822fd20
-DIST vivaldi-snapshot_4.1.2352.3-1_arm64.deb 80640544 BLAKE2B 4beffa4351157bed1e8b87af926876bae7b145d35062d8320cef059d9959789f6b11fb7a41ab3fba2adc5f5639a161d6d56675ebcfcf998ccaf9a532c111981d SHA512 75c3871455b06bb338ecd3b44995a445ddd8fb47277cefc5126e044859ea42f295cf793c9d1817e1917dc1172992ea009635859596a9bf850cfa5e9fb5c2f876
-DIST vivaldi-snapshot_4.1.2352.3-1_armhf.deb 76513320 BLAKE2B 3916f00208317b05cc6bb48481ed625e9407721b6e2f35c8f384703308e9da0edd476529d8b3ff57d647b25d7b97116567b005e800fc875cbdf0a48880aa5edd SHA512 04c77b4e6142b516a19bc2fdddced5000f30673e3997cf4fd380cb020f6cad64e1bfaed60d18d366b27d3b1a9a963e1a0ef669c418828a70e0e01cace1588a5b
 DIST vivaldi-snapshot_4.1.2358.15-1_amd64.deb 85118372 BLAKE2B ba0812c276d36c7fcdb1cce040ee0daa32afa9fc95695136cc202a86110132050ddffd80ec9d2f10293030f3af8e6c47382da7d8b59bca62e5a5636fc8980222 SHA512 ce7819f297cce1dde4746bfde503abb2133defc0ef80d89c371ed1d6bea76e5123c7f449c4edb0cc0212d2f7f1e651fe4d8960162320e04c48761666cd61f1ef
 DIST vivaldi-snapshot_4.1.2358.15-1_arm64.deb 80658544 BLAKE2B bd42810379f787abe46f88ba2844c209f1c8d41089b3a7a9a487f2e8b6599f0577ea46df3dfd4c3ff35f3ecf9ba9b86920131e6b16313a5852efb00e683f6860 SHA512 60f75623b5891978bc35f032fc676671d1d1277989a7b42a2fcae318943eb60d8830f76738b08b11833d205b8d27ce00deed7969a2a80de1c421987526b642fd
 DIST vivaldi-snapshot_4.1.2358.15-1_armhf.deb 76520492 BLAKE2B bc96e33a3b9395402df488f54819759eaa169665376b6f779917f1d1d284c0dc43cc276b5428746ab02157093ea8a6323dfc86db4265721fd83dea6715f9bfc3 SHA512 2db620443b842929bef57e1ab64a23540d02b03cfd08ef67d45fe73d6a7ac948e895ccddd571c9b1145bfa8a7255ab878ff2b65578b7be358da770f88653f407
+DIST vivaldi-snapshot_4.1.2367.3-1_amd64.deb 85157012 BLAKE2B 9d857c360a9e9edc41dab9629f6b1b378852767b73409657f6d23a53501f00b7e73c66152c3ecbbb72585c65e47250c7bf505582a0c784fee0ff85efd1022dc9 SHA512 277d77414a2bb6ee8656390d8769fcc6c99d3247be22436fd78b0d370ba0b368dbbe24e7f5cd7da05fa4f076ae5ab526de371aff7a3299a534cbd85f76dbc60a
+DIST vivaldi-snapshot_4.1.2367.3-1_arm64.deb 80674668 BLAKE2B b28f6eba0d5cfec734435e493e8ec348974d9fb4efb9533ce6c4283223a8bc46d1a0b8772692a93f6dd1521744a30ad25edbf6f0bfab967a66fced915128216c SHA512 27244952e5ebc0271a9d05d2a792d90840ba59a5920c6767aab94459895c71cbefc721b582b81616021db73d7855634d0e01c6164719251375638774eb920547
+DIST vivaldi-snapshot_4.1.2367.3-1_armhf.deb 76537504 BLAKE2B 61e624822b2a0b54529e2213690fbc5c5c17c15e8fd57a8549466e016f11e42806796be1212da103e05d4327aa9a6a704e4adce75897f0274f7e0e1711885e97 SHA512 b5a62e6b6dfe1b7242dfb860ba8ba2cde188b7bbac1f22ee02e439030eabecfe5977d441cd6310d087d8ef301025cdae3f30285bed962289ef2b1bce038955dc
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2352.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2367.3.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2352.3.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2367.3.ebuild
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 2e2cf441b16f..b3598c162808 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index f6d26f7621e3..b7490995c87d 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,2 +1,3 @@
 DIST xwayland-21.1.1.901.tar.xz 1258684 BLAKE2B e689f9342bc1e3ccdd0807dc3e47d04e34b9d728698848c155cb489a02002ef8120cad1322db9d6fe955d275fc6c0835bbc76d61d4a2aa26118bb267c16e7717 SHA512 60dec3875e8ea60f8fc53eea0ebcb55c948cf5eeb40b30f6d5e13d8c7b48d0aabd035884ae108fce0b03ca5da592d1b0e395a9c5198c1204e8407ec119d9bbee
 DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a85bae214f9d395450b6945ee845d28c7a8580e6aaa5f3538d06083312391d24267e6b239bfc533526a1bd7a56f0a SHA512 0cb03d796af183f9fde14c30ef45d94ef466ac4ba3d85dda34e74f91dd94bb75d0c8a867ecb7bda7ea61d98c70a4f73bc98c5a205ea5f69a0e222cd780d263d8
+DIST xwayland-21.1.2.tar.xz 1258732 BLAKE2B 1a797e4dedee4f47ada968d4a06c89da2fac64bbfa587e84f01d5b0aa7da23402b70369a274a672470e6d8df0645fd117d129d1f2049b25394d825a9eed3e451 SHA512 3bd595a563cbc44b49a00c85adabdbcddf02fd55c6500ed2711557c156f10cd273af93f7b232865141ad27392a85583e40268bcedad183ad9eeefba457cef6c6
diff --git a/x11-base/xwayland/xwayland-21.1.2.ebuild b/x11-base/xwayland/xwayland-21.1.2.ebuild
new file mode 100644
index 000000000000..b4eed7a433eb
--- /dev/null
+++ b/x11-base/xwayland/xwayland-21.1.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+
+IUSE="rpc unwind ipv6 xcsecurity selinux video_cards_nvidia"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=x11-libs/pixman-0.27.2
+	dev-libs/libbsd
+	>=x11-libs/libXfont2-2.0.1
+	dev-libs/openssl:=
+	dev-libs/wayland
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libdrm-2.4.89
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	>=media-libs/mesa-18[X(+),egl,gbm]
+	>=x11-libs/libxshmfence-1.1
+	rpc? ( net-libs/libtirpc )
+	>=x11-libs/libXau-1.0.4
+	media-libs/libglvnd[X]
+	unwind? ( sys-libs/libunwind )
+	>=dev-libs/wayland-protocols-1.18
+	media-fonts/font-util
+	x11-libs/libxkbfile
+	>=x11-libs/xtrans-1.3.5
+	x11-base/xorg-proto
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+"
+
+RDEPEND="
+	${DEPEND}
+	!<=x11-base/xorg-server-1.20.11
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use rpc secure-rpc)
+		$(meson_use unwind libunwind)
+		$(meson_use ipv6)
+		$(meson_use xcsecurity)
+		$(meson_use selinux xselinux)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Dsha1=libcrypto
+		-Ddpms=true
+		-Ddri3=true
+		-Dglamor=true
+		-Dglx=true
+		-Dscreensaver=true
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxv=true
+		-Dxvfb=true
+		-Dxwayland-path="${EPREFIX}"/usr/libexec
+		-Ddtrace=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../libexec/Xwayland /usr/bin/Xwayland
+
+	meson_src_install
+}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9600572cc0c5..7bd2f024c69b 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2-r2.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2-r2.ebuild
new file mode 100644
index 000000000000..58e0326eb0dc
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.24.2-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature xdg-utils
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
+
+RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	bluetooth? ( net-wireless/bluez )
+	connman? ( dev-libs/efl[connman] )
+	geolocation? ( app-misc/geoclue:2.0 )
+	pam? ( sys-libs/pam )
+	policykit? ( sys-auth/polkit )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		|| (
+			dev-libs/efl[systemd]
+			dev-libs/efl[elogind]
+		)
+		dev-libs/efl[drm,wayland]
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+	xwayland? (
+		dev-libs/efl[X,wayland]
+		x11-base/xwayland
+	)"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-D device-udev=true
+		-D install-enlightenment-menu=true
+
+		-D install-sysactions=true
+		-D install-system=true
+		-D mount-eeze=false
+
+		-D packagekit=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez5)
+		$(meson_use connman)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use pam)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use wayland wl)
+		$(meson_use wifi wireless)
+		$(meson_use xwayland)
+	)
+
+	if ! use wayland; then
+		emesonargs+=(
+			-D wl-buffer=false
+			-D wl-desktop-shell=false
+			-D wl-drm=false
+			-D wl-text-input=false
+			-D wl-weekeyboard=false
+			-D wl-wl=false
+			-D wl-x11=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	optfeature_header "Additional programs to complement the full EFL suite:"
+	optfeature "efl-based pinentry interface" app-crypt/pinentry[efl]
+	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
+	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
+	optfeature "an EFL-based IDE" dev-util/edi
+	optfeature "image viewer" media-gfx/ephoto
+	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
+	optfeature "system and process monitor" sys-process/evisum
+	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a modern flat enlightenment WM theme" x11-themes/e-flat-theme
+	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/mutter/mutter-40.3.ebuild b/x11-wm/mutter/mutter-40.3-r1.ebuild
similarity index 99%
rename from x11-wm/mutter/mutter-40.3.ebuild
rename to x11-wm/mutter/mutter-40.3-r1.ebuild
index 0e7403318d26..9a16e952ec04 100644
--- a/x11-wm/mutter/mutter-40.3.ebuild
+++ b/x11-wm/mutter/mutter-40.3-r1.ebuild
@@ -64,7 +64,7 @@ DEPEND="
 		>=dev-libs/libinput-1.15.0
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[wayland]
+		x11-base/xwayland
 		video_cards_nvidia? ( gui-libs/egl-wayland )
 	)
 	udev? ( >=dev-libs/libgudev-232:=
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index fc68f0cc2772..0f635028ccb8 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 201fd9183da6..1cee65559d4b 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1 +1,2 @@
 DIST xfce4-sensors-plugin-1.3.95.tar.bz2 486771 BLAKE2B 130b38d30bcbb2e08ca167846f32ebc7e60ea2cd855ae0bcbcf82e8a73c9cdf04cd91da5c5e8e1a73c79b0d36e00366a37fa04cb40abc477df70dd2ee77d866f SHA512 265dec06bcd7a609b992e70273e8b11fdbaec41b0eb4dcb1b390e315b924743b3833b65fe2d237bb0b457e61943b97c065b34138216b171d111f5e923602642b
+DIST xfce4-sensors-plugin-1.4.1.tar.bz2 471543 BLAKE2B a5cc58c7c8a68b78dca7c810083daa69a43e265161e2dcfd2b99ee16fa40583c0e5a6f1e31cb6d3ad23f8a0cccacd52ca7d44623a32951b185614404f917c7a6 SHA512 d3f335e1f18fe748648be07ace6a88eb9f95222dd4d8dd4f6e5cbb3b7c69bd93b02fdbe12b9f08e65fbf7ba8461d7a685467f9e62c0682c85b3699fae5b7ed33
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.1.ebuild
new file mode 100644
index 000000000000..c6f3e1ff121d
--- /dev/null
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A panel plug-in for acpi, lm-sensors and hddtemp sensors"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
+
+REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
+
+RDEPEND=">=x11-libs/gtk+-3.20:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:=
+	hddtemp? (
+		app-admin/hddtemp
+		|| (
+			net-analyzer/openbsd-netcat
+			net-analyzer/netcat
+		)
+	)
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+DEPEND=${RDEPEND}
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable lm-sensors libsensors)
+		$(use_enable hddtemp)
+		$(use_enable hddtemp netcat)
+		$(use_enable acpi procacpi)
+		$(use_enable acpi sysfsacpi)
+		$(use_enable video_cards_nvidia xnvctrl)
+		$(use_enable libnotify notification)
+		--disable-pathchecks
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}