diff --git a/Manifest.files.gz b/Manifest.files.gz
index 91f727ead9b1..41d51d57a316 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 256bb6871786..dd3b698539e8 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
index cb451983b1c1..9b674667c82a 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 472f28a908fb..c648a5a64662 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
index a63f20455dfc..829cccf812bd 100644
--- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bd318f0d6fd4..f4a87bbde869 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index c02b97fc49d4..71e910df7790 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -2,3 +2,4 @@ DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a71
 DIST dpkg_1.19.6.tar.xz 4802832 BLAKE2B e35a805942e2b26a90cec80493a14697461cfb1c1352fa7fadce7171c8cca88785ff2590d34b8f0bd4763642cb21ee7bf449df86b01eef223554daba4604d1b1 SHA512 71981079835ea4bd5c4a381ca8702cf489c788034e29c129899eb288cfaf4ec55eb58c0aea13145dcde99f15a47d2de71fba7b5e7eb8e6b1b1d6f016de8a919d
 DIST dpkg_1.19.7.tar.xz 4716724 BLAKE2B d65200fc5da986db8b66e31e1ea45b9757b87e0fa15f7fc0579f1c1c63de78829c1a10bbc72726fe3b75bf6c11cbe1fe3c9b62f8374c796f990835f9f0e79dd2 SHA512 9ca441dc265baf5359c71617aef1c57504a7097c26ea57108b88dadc511bfa9918fcc765d8c67cec9def9916c5df92d6cabe508446dbc7223a29b45260445e81
 DIST dpkg_1.20.0.tar.xz 4738556 BLAKE2B 2e58b3881abd46854416b05b0f9d2e972c3b545412a506b7bc18f1ebae5d82eac8bc2b55920d706fee0ca02239871c4f1c121e0c780aef31404e0408fbfa76e8 SHA512 5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9
+DIST dpkg_1.20.2.tar.xz 4710300 BLAKE2B 0d10ee7f5cc863a6496fd8340cf0457f9af3d7d7a74821d561d0cc500a056d52664d1418453fa45dcb27d01ef59e55eb299ce1fcccd1ae7cb72b7c9e43b6b120 SHA512 523713e40d4f49332d96fdcabaeaf4d97f56b40bbbd51f18d17b5c79598249d04fdf96dfc5c8684408a666cf04f622cbd30da60efe68ba2cf1cd836cb2503e02
diff --git a/app-arch/dpkg/dpkg-1.20.2.ebuild b/app-arch/dpkg/dpkg-1.20.2.ebuild
new file mode 100644
index 000000000000..371e6291f509
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.20.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.14.2:=
+	bzip2? ( app-arch/bzip2 )
+	libmd? ( app-crypt/libmd )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+BDEPEND="
+	sys-devel/flex
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+"
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 libbz2) \
+		$(use_with libmd) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux libselinux) \
+		$(use_with zlib libz) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index f276dfd02816..a2e688c7e6ab 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,3 +1,6 @@
 DIST rarlinux-5.9.0_p20200330.tar.gz 606599 BLAKE2B 81803108938b82aec07e0a8aeffe764219c6965ddbda3ac73c04ee0c6c7f8ae6090bf7a39fc0215a639fec8f5b9af7f8518ae2c18bcd2a0f836c0560740fde38 SHA512 0c5328d3113e0c821d840dafdb7bc0b4f5161b8b7d76e2227bae3daa3bf55d99d06a167ece961157f69ec2494259bb56dcd87769b0782962614cc2c4de01892b
+DIST rarlinux-5.9.1_p20200625.tar.gz 606675 BLAKE2B fe8f26d422bc816fbba27405f9d2e4063e9af6e136ca4c270bb5274a67e99d9a7c97250b05e6041f3ed27517398b0500aad765a1f599474ff08ebb6bacf5b0a3 SHA512 3ed37adda5f5b2f5502ab2e549614dad2848157321a31174d7259aaf77cc773c6398eb0e19ee6597536c58a938289a587e7db9681e6c47c906a5307c2d362147
 DIST rarlinux-x64-5.9.0_p20200330.tar.gz 595460 BLAKE2B cc8e3dfdbd10a959b9643a4a6b12e8e346f6ed2797fee61fbfecd02b8570212f87514e749943e8998941fb00e026b300597ae52975ac326cc0a2962ba8d1a8a8 SHA512 a7d88a8705e4876686f880eee461180a3d2dac5c4bafb2efeec46a8c2bac2c07b09fc0827f39aa1417d0c8a64d3ed5b55244b08400ce5a0591984e0e9c5c853e
+DIST rarlinux-x64-5.9.1_p20200625.tar.gz 595595 BLAKE2B 68eb24da7ecb2fe8a2be68bc3c3397df85490f4cd5517a2dc5390ad0dafbdd0a04d15968276657d600cf6c127cd8f52b74e920f7ee9b86b7083b9edbf0a57141 SHA512 6e0aec1642118331bfe79a35fa654f7d5143e61c0315375fa21d862a3941b672c58eaed4da69b8ea23a024aaafcfd02a277251391e59220b845847d4b3b82562
 DIST winrar-x64-5.9.0_p20200330.exe 3226248 BLAKE2B 50459e4b476bf9ec6b59df712a61f5108442fdaf58f7ccb1c021f1638a3327e155a5b3573e0566d3a262b8129fc28c176ccc2e9a3edf2851986c8a5aeb3288d0 SHA512 8b0791eab87aeed9f30272f11fa304189f1f5d077457d3ea608c59e19dfd6ee9e05f98f03cba4803dbe24b5bb68f8332a59cd9bd2fae76d0da0405a92b8e3b3c
+DIST winrar-x64-5.9.1_p20200625.exe 3246712 BLAKE2B c0616e600b11aaa524154b9b0108ab1a62e09cdd27a968b5bf9fa6d742800c9006ee7655df39511f31b24506dd03eb431c3e016ea63a5fe8fff702ccd8d3b358 SHA512 da7a85d56f1ed4dd6204e51297175c90349a26896b223bf210055a0c38f315c59f9d9b8368d5c279049443467d962c72bad48a3c62c1d80f2260f8ecd4d17db6
diff --git a/app-arch/rar/rar-5.9.1_p20200625.ebuild b/app-arch/rar/rar-5.9.1_p20200625.ebuild
new file mode 100644
index 000000000000..7623c5c7ee5d
--- /dev/null
+++ b/app-arch/rar/rar-5.9.1_p20200625.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
+	else
+		doins default.sfx
+	fi
+	doins rarfiles.lst
+	dodoc *.txt
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 072a840adf05..57e0194c4ab7 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,2 +1,3 @@
 DIST unrar-5.9.2.tar.gz 229900 BLAKE2B a941ef6566a5b58990d88e6e99cc23c169fd7d99fe2c8ef1313db860f9f220510ea002990740c4b3a3f980c037f9b3be4cdad84624a9a6f5094b1074721800d4 SHA512 e48dd3327d57522aa676e8fd6e29b7133ee9921eb1525d90ddedc61716ecfeefb51a7eb3a667f4f81f21a5ce8654727617d33463a5b6a40a7bc32252fa9f25df
 DIST unrar-5.9.3.tar.gz 229917 BLAKE2B 6ab2141970535753197d3ed74521f80d3b20ecc2a0f620932c31bd1b5ce4c70bc3e2671fed0a9a77ceb4f42f6423d315f3eac0a00dac334ee2c3dd60a569c78a SHA512 38b2e2e527a4d2df627072acb4c205f46c96771969db4558be04adf9166502b3b9c3d1cc60fe290b6c4ce56db68bb5e0b0ac3bf0698d9820d4840d56cc5f3e2f
+DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
diff --git a/app-arch/unrar/unrar-5.9.4.ebuild b/app-arch/unrar/unrar-5.9.4.ebuild
new file mode 100644
index 000000000000..7a4b90b3f3b7
--- /dev/null
+++ b/app-arch/unrar/unrar-5.9.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S="${WORKDIR}/unrar"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 7832c82ae4e1..6ab9e6e725c7 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/btrbk/btrbk-0.29.1.ebuild b/app-backup/btrbk/btrbk-0.29.1.ebuild
index c89e18ac6c45..23596e82881e 100644
--- a/app-backup/btrbk/btrbk-0.29.1.ebuild
+++ b/app-backup/btrbk/btrbk-0.29.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 28fa6854bb52..1d7bd8e6976c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libsecret/libsecret-0.20.3.ebuild b/app-crypt/libsecret/libsecret-0.20.3.ebuild
index c822953c6dc3..07aa303ea628 100644
--- a/app-crypt/libsecret/libsecret-0.20.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.3.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
index 16b2f5b0d5c3..05b44dc38cb3 100644
--- a/app-crypt/rotix/rotix-0.83-r1.ebuild
+++ b/app-crypt/rotix/rotix-0.83-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
diff --git a/app-crypt/seahorse/seahorse-3.34.1.ebuild b/app-crypt/seahorse/seahorse-3.34.1.ebuild
index a3dadbaed708..8eacc79d305c 100644
--- a/app-crypt/seahorse/seahorse-3.34.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 061e98fbd319..854647c6b598 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index f8760f06bb42..224587192592 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1 +1,2 @@
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c SHA512 0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
+DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da SHA512 a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88
diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild b/app-emulation/lxc/lxc-4.0.3.ebuild
new file mode 100644
index 000000000000..9f71458a5e7e
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic pam readme.gentoo-r1 systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools"
+
+RDEPEND="app-misc/pax-utils
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	>=app-text/docbook-sgml-utils-0.6.14-r2
+	>=sys-kernel/linux-headers-3.2
+	apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# --enable-doc is for manpages which is why we don't link it to a "doc"
+	# USE flag. We always want man pages.
+	local myeconfargs=(
+		--bindir=/usr/bin
+		--localstatedir=/var
+		--sbindir=/usr/bin
+
+		--with-config-path=/var/lib/lxc
+		--with-distro=gentoo
+		--with-init-script=systemd
+		--with-rootfs-path=/var/lib/lxc/rootfs
+		--with-runtime-path=/run
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+		--disable-asan
+		--disable-coverity-build
+		--disable-dlog
+		--disable-mutex-debugging
+		--disable-rpath
+		--disable-tests
+		--disable-ubsan
+		--disable-werror
+
+		--enable-bash
+		--enable-commands
+		--enable-doc
+		--enable-memfd-rexec
+		--enable-thread-safety
+
+		$(use_enable apparmor)
+		$(use_enable caps capabilities)
+		$(use_enable doc api-docs)
+		$(use_enable examples)
+		$(use_enable pam)
+		$(use_enable seccomp)
+		$(use_enable selinux)
+		$(use_enable ssl openssl)
+		$(use_enable tools)
+
+		$(use_with pam pamdir $(getpam_mod_dir))
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
+
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
+
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
+
+	DOC_CONTENTS="
+	For openrc, there is an init script provided with the package.
+	You _should_ only need to symlink /etc/init.d/lxc to
+	/etc/init.d/lxc.configname to start the container defined in
+	/etc/lxc/configname.conf.
+
+	Correspondingly, for systemd a service file lxc@.service is installed.
+	Enable and start lxc@configname in order to start the container defined
+	in /etc/lxc/configname.conf.
+
+	If you want checkpoint/restore functionality, please install criu
+	(sys-process/criu)."
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
index 2c8da9a04c68..c13d5834460c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index d30cdbdc4299..15315ed99aa7 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/tuxedo-control-center-bin/Manifest b/app-laptop/tuxedo-control-center-bin/Manifest
new file mode 100644
index 000000000000..0a98d1abf690
--- /dev/null
+++ b/app-laptop/tuxedo-control-center-bin/Manifest
@@ -0,0 +1 @@
+DIST tuxedo-control-center_1.0.3.rpm 71190696 BLAKE2B 8892d6612f5610171a8b4832b3a806afab0e1ae8cab10c60dc731100b2e8a0e4e680b19e90d63695ce90bab65e904be0a924e1accdd21fb403cb7773771fb21f SHA512 cc76fe1b65f8b8bd8c43352cd64400c635e7b8db0fd07b71fff6caef690d9c3f415350cba5dbdab14c8dca5aadf045d458ab399bc58cb070b0ee2d11563252c0
diff --git a/app-laptop/tuxedo-control-center-bin/metadata.xml b/app-laptop/tuxedo-control-center-bin/metadata.xml
new file mode 100644
index 000000000000..7b7524b9586f
--- /dev/null
+++ b/app-laptop/tuxedo-control-center-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.0.3.ebuild b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.0.3.ebuild
new file mode 100644
index 000000000000..02e798937cc9
--- /dev/null
+++ b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.0.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm systemd xdg-utils
+
+MY_PN="${PN/-bin/}"
+
+DESCRIPTION="Tool to control performance, energy, fan and comfort settings on TUXEDO laptops"
+HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-control-center"
+SRC_URI="https://rpm.tuxedocomputers.com/opensuse/15.1/x86_64/${MY_PN}_${PV}.rpm"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RESTRICT="strip splitdebug"
+
+DEPEND="sys-power/tuxedo-cc-wmi"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	rm -rf usr/lib
+	mkdir files
+}
+
+src_install() {
+	insinto /
+	doins -r usr opt
+	find . -type f -perm -a=x | while read f; do
+		chmod 0755 "${D}/${f}"
+	done
+
+	dosym ../../opt/tuxedo-control-center/tuxedo-control-center /usr/bin/tuxedo-control-center
+
+	insinto /usr/share/dbus-1/system.d/
+	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/com.tuxedocomputers.tccd.conf
+
+	insinto /usr/share/polkit-1/actions
+	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/de.tuxedocomputers.tcc.policy
+
+	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd.service
+	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd-sleep.service
+}
+
+pkg_config() {
+	ebegin "Reloading systemd"
+	systemctl daemon-reload
+	eend $?
+	ebegin "Enabling and starting tccd.service"
+	systemctl enable --now tccd
+	eend $?
+	ebegin "Enabling and starting tccd-sleep.service"
+	systemctl enable --now tccd-sleep
+	eend $?
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	elog
+	elog "You need to enable tccd and tccd-sleep service before running tuxedo-control-center"
+	elog
+	elog "For your convenience you may just call:"
+	elog "  emerge --config =${P}"
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest
new file mode 100644
index 000000000000..6f792af44007
--- /dev/null
+++ b/app-laptop/tuxedo-keyboard/Manifest
@@ -0,0 +1 @@
+DIST tuxedo-keyboard-2.0.5.tar.gz 31001 BLAKE2B 931d011e2ac521cef1670a8952886c1ac9b2476c6227c2b3cfce28d52622d3869f3c55773279eea3cbcc94d7c5b12d5d5653a8e2f9c142d0c044fa23fddd958c SHA512 3b7a9331d04e2918f3452f9561b05f39ea458960c2ade299a368899638987178cfd33fa066a0835f88b14c240d7937692d7994ccf978749ea7fdc428e587e06a
diff --git a/app-laptop/tuxedo-keyboard/metadata.xml b/app-laptop/tuxedo-keyboard/metadata.xml
new file mode 100644
index 000000000000..e42604230c16
--- /dev/null
+++ b/app-laptop/tuxedo-keyboard/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mschiff@gentoo.org</email>
+    <name>Marc Schiffbauer</name>
+  </maintainer>
+</pkgmetadata>
+
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild
new file mode 100644
index 000000000000..52e9192e8a9b
--- /dev/null
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel Module for Tuxedo Keyboard"
+HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
+SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="all"
+MODULE_NAMES="tuxedo_keyboard(tuxedo:${S}:src)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d5f96527abc3..fdcfb5f70780 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/gnote/gnote-3.36.1.ebuild b/app-misc/gnote/gnote-3.36.1.ebuild
index c31e6fee60f5..0a1202afea6c 100644
--- a/app-misc/gnote/gnote-3.36.1.ebuild
+++ b/app-misc/gnote/gnote-3.36.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
index abcad10102f8..6c68ed5ec6f0 100644
--- a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
+++ b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://leute.server.de/peichl/transfolio.zip -> ${P}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 2826c03213a4..aa5f7fcb9525 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index fc18cd6c0114..3e956160c6c4 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -334,3 +334,171 @@ DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz 293468 BLAKE2B 6b72
 DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 839489 BLAKE2B db106ccc68b59b39996dd2e2244b1d01ad8190522ac5d13b734884f2eb885cb58fc9997c32ca7afa03c2488016d2bd7a31125ef97af73336901b2d97b204b850 SHA512 5cd514c8a428fbd7f0573859a5fd7eaab6f5b6b5413bc5aa9b5d8aa84f87183015dbe88e227689d36bf6cc921317cac8104fea8c7f692991ef4ae547307a798f
 DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 845999 BLAKE2B 2cc863bf481b05d94b9a8112d31791641ae50d7f4331c56f2a8623da2fa067e580e5ba6fd84bfd981ba2cb28383a3ca5a5fa102055e92e2b11addbaeed5a4a0f SHA512 44db4591a23a0baa5d707e17113df17c4f8526b29d555a57b5cce9cda578223ba070dedb9c5cd5bcc896d9fb6e464802841822924d90e3976df82f0ea8b8ce06
 DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz 323892 BLAKE2B 286c82394158d90476cc6d8c474239c3ab61f25759b18e5df1e9f3cdbf2b20cbe80396c083b3579e66f7cb0b347c9265748f1b0a5bb4ed82bc8c56619ef61dd3 SHA512 70435cd9c1eac3bee2809741640039526f2e80ed5a88014d7cb7171659004ba24ce1431026d0e9dba658c6a2e736ed73bb8808c1acae4467cf3a82d42e704bf5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz 3552341 BLAKE2B c3f3e1ec14351ea2ed28259c1f787e2a2cc14341fcddadc56c329abca03ee786d4030cb3ba9f881858b205fedd28145d43585d6b85653a3ebfca1d9d11fe7fb6 SHA512 f092438182480f0400a59e71ed14e888e6954981a0a635dd8e7bddcc5d56b0a3ba2c3121e38a7026d8a5bd722e5cccbf33cc84f09ca1219d9477d688a2070be5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3295154 BLAKE2B 8dc642c482fb0b1cb75593b810d644b48e8f4a8ca66b0224770c5cf18d72ce9729bede36ee25c55c15f104e492a9f76f89a85b6e25525a4b55d19a8f75c1769d SHA512 3f43b156b46fcebf9978b3f1da5dee54f749ded38a723d698645658087ae484fdf10e7d7de030ce759b443e275fb2d638aada043b12f39a5b45bd1d3a47eb4aa
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz 3579496 BLAKE2B 70a4ee26ebfc3d24ae8da314158b153c52faa2b08a242a652e87f2677352f59934cb2545356a8ae8a0478cd773dd0ec265cc4a9385fe9f0393f1f5f794065b30 SHA512 0bf44bbc5c19260036a0fe09bace20bb4d5d49c07741eecfcd18c972b4206d2240fc02ef1547d1ac6f80087a9173218aabe6cb4621ee2fe676600edcd8c78dab
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 3705854 BLAKE2B 5242a94ab1bd06eefb16fa69cf8cf4f9ee9805249c2a34e6c192bf6fcc831e69e5b31c9b5fbcac937a9242c621e097c435afe97b3b3f417836b233a6512c27ff SHA512 ffcfc0c732f2c48e2c8256fb6bc1153ddad7b5f2a8c97c1dc2b1a83b0deb92a06a24a053bd13469be764642832193557595c6242370745f8c406a031d861ce83
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3437287 BLAKE2B 6279817a527e848fb8c259e429de9480e357fed665903c5594fdf26a0f82e898b73a446a18ba3af9c0da3eba86ce1fce174f91647bf74b9f5cf7e06d1960539c SHA512 c348ea16aa4d6b3f04a6258b692fb92f62c4496ec15fdb8fa7aa5fef4cf823d8ec7abeaa4ded1f80abe2d1c714632585e03507b00970b4c5acf6dbdd5ef26faa
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3455706 BLAKE2B 5bec23e9577d037d8ae3f11a43ab8863fd1a3b3b543db5bf8d80298d02fc7064e36a48087d7589b048ec1cef14108ae551c992b68b801d122a523c5596a74d88 SHA512 e3b2e76c427167bc728c6cf46af70e9d23c0c9c6a2a813b70640e2652c9576c1b045c6b9bf04ca2cbc90e66225253392bb0fb9375c771fa111b4ba8d9a6daa25
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3187073 BLAKE2B 3417c3ac345c0a7360d6a22e7853a7ec5a52b6cf0fb585cd86ab02770fe13065c3923ef14d32ffc5be9c55eb340820cd273fd82960a64ec67546ad797013670d SHA512 ec48a356498ca002914016dea5ef1dd375a1f18a65a47598632cd0a61c115032d723e2876ee5543cf10a4ff1a2dabe924419b0e4aa3126c4930d3f425b56f7c1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3299051 BLAKE2B 624752098798ba094694cf39475ff5a230916a5b58d7da0e7df56068bfc6c48d9fa23d2a033834d47e78d6e07c5c1180b334adb702c3d34701815b1f123e7c41 SHA512 6ce460db684cc8585e88bef9e2ff447a3c1ddcf6f61e54eafa277977dd64f3485402cf9a696f8cdc76bb781aaeb78d6a9a52f531c2bf1b2402e5b187486b8c3f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3290126 BLAKE2B 96c31161a4f5c412ca3fa7aea8ef55332776938a3c21e43885e106c8793c096ef17ec5d101d5cbe48338cdb05437e4718181d56b6847690f8443d1e79d28c726 SHA512 f409ce93623907c51e4dc1e0cc85a9d6b67c08a60a42ea1a787c1fc54b95b5921860a61003dfc25af539d9feba12ad43e40937f7933b8adfc2eeb4f4252a09e8
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3318290 BLAKE2B 71d478cdc1bffe5ea8e3d4354d5110e36a9c3a7e9325813914c25143ab400fd2beb8e7bec6dd7ee747a0f2c0b23330192233b7ea8b762286eecf968f141499d1 SHA512 166cb31ed76b7479009eff6485ff9a8f7dbb23d0b2229e860097485dbf730b04ddac6e5d647cd87bbfabd14c560ade7efa4f12fa6d0ee55448ee63fad545b404
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz 3239566 BLAKE2B 33a6c804725370156d2dfac7e627cedda2fe15281c8d97c1e5ccc794fa34547fb74a424a386a16631c57f56749174ee07288ffac0983b08972ee3436a9a4da2c SHA512 02fe51cc7357d342440112129a4094be774d73a361d88631205ca6b845771664414e64f223f74426232b83f95883c370433dafc49de8cd6c0c2ff566a1866c1d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz 3381518 BLAKE2B b625142a352cf5f4cb96fcadd595f9c66f2e5b4649b76d6e0105d1a12771476229fb293f2b840bf9b362c6faca76554278a078552ddcd3ed706fb342317d29d2 SHA512 e5bdb74b6c3a4301a9c00553ccc28a511d929095193351c259ce7f822f7b74ace6a4fa8f669c0e0fd93e1b68d9e172bb49d3272c6e51f30f2ac26482af57f39d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz 3604322 BLAKE2B e8a019f7fe5a94a9f958276a98f4e5e069c76efc37f6bc8c2a7ab6465a5b8225955f5d43aede70fa657594ea0dbe45922acda585e4eb69b4ad0ed8effacada92 SHA512 9e1b8a245781956257d6dfd4bff372213119d10c7edfe9c4e6c9c4ebb3cfe95f4e9c5c707d1cc55d7467791ef39a8dfb29ed7908bcd45ee065391459e9d2d642
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz 3958021 BLAKE2B c8db28733a867bfb9f373ad29557816507a690b0b2ead35fb3391277aeb836157f043cf64a1bc9f9f71d1004683aaa52220fbffe0c927954ed178ce13bad25eb SHA512 8d8e5c67129002dc9d9c32d5c182f34bb91401714359515bc6b493c9baf6051e2c043b17c2992b1c1158f722859a2f08351d92c97dd3ff06d0aa9865655b4565
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3081792 BLAKE2B a29640479dbeccab73b548f4744229200bf0cabf889d16edaccd3dec92c5d330c332333463a169ac61ae369a3c091d4b45c5cb2c4621b8cdcec4452f541c8e94 SHA512 01e11f6f2d3637c972abbd16f477ef0cf135cb9719801c573584976a7d6573f21ee82fa1b2a86326946ad8b7caddbc99ea7fb9c839318e4f217b5d0031fa621e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2178819 BLAKE2B 1a279ff976bfc172352638a39547aa0d4dd4bf4134ff499153f1c1d096429d8a0286b4f07e233f947c2caa31060ffb76f338cb08e296ff2d18b72f2bd8fb0656 SHA512 b236d443f552149c234f32190867e0c4967552f0aaae40bb0f4c3a6d2945ef6c14819064bf1c7d538e8e3a3c8750f4112efd7c34972640540b69e4b05ce7716a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3075163 BLAKE2B 7f35cb98f502f0b80e7572ba8e8399c051e5299609314defd10263320741743b0bb799761c2ef8fdbd49d76da96ba403c63b7e50eb8c1596e54a3522f2b4689e SHA512 b418a804ab88efe9906662af7981efbf08246f36448d3df25e83437292d6a59991b8c014cb7a80d84d6154c3887214fd8cb0922375667d39752424046fb06424
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3156487 BLAKE2B 1c3a7661446b969a9c75e54bc5c9f84a3055b0463d7ac5bf2fb35fc7d1a4980e88058d9b9006a84bddd02e8d0bf640a622968094bd93c533ae339748706d7e8b SHA512 b3c8e3ccda0638bcd7a1a426979ba7f3a9cf9ad904911594de7c3c88eea8a0d71461242f5d8b0c1a037d8ece86aec70965669cf37e424d90cec31dfee648c495
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz 3336089 BLAKE2B 35ac87a1fd77d75ad31fd7cad594832acb48adcc2ed808aa79de88536a64cb358fcae9798801fa147e0d524f448d748d268af8b26e38593b27d6247ba1c9a32d SHA512 8794e513171ead973074ffda7c71dba49e66b2b6bdfb81f7ac52ddf1df38a7139940a2bcccad6673eef02a2d7d911327c06badf3a5b917be2b9ec1c2f513a221
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz 3215428 BLAKE2B 0d4c3c437eca8f204094e27a8689ff97c02ae928e975a6adffea10e400c264dd1536e5517cad79431cde5a3308f352f059cce5d6b1a31432f4139fb00f7fae95 SHA512 b46d70a845c313c5c2ecaca6c49233c38ed00bec82fb04ead165b9b7b904eda56e142aa5d96c49d4c6d0998c0264507049b515d6152be831e8e06d6134181b94
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3174617 BLAKE2B f076b5c2a20657e6e9c9b785821203472af01ae6214af188dfe91f8fc3034a6471edf807f313f97ecb686ed484896e3b739fe03ae1bbf4f6d4dd957b97196129 SHA512 1a66b377797617ae761140c19504edf54da948e83c3db0043e1ab851031c9727bcd3b7ed965a612c21c20afb372f5e545ee039db1f0b939793a7feb0f25f36f5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3223578 BLAKE2B e016279c833e1d9446c09aa162282bab16b6de1fa376995bb12032dbe2fe53a298ca7809ef74b6bb31f7aee85e9ccf26092d294e42ff2922363649c3643860f0 SHA512 b6bdd61d2078057a363585bcacd21d07c27d05d9489a47c8f81d5f528b1285902bf260edbea9eee448de5c312990cd9190e2c75a7c53603edac56c810ed025b4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3329515 BLAKE2B 49a92a3d73a522bacff94ec6ebaf43bf76e8a6032aabd4a073530f1a770e0e6cfc009670ce5d4b3d3cc896a1ccd7ac8de19f87736835775fd3a9d50af26622f3 SHA512 cabac0c4995e05b96b85ae0dd95ed6319f32632b8dc55c7b39135371025888a2884a058f4e907a71c5fd464352b40a337e26c460e35347695e202eb4d13d6281
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3283448 BLAKE2B 971584184fa8a20c36149c899fe2a6057b095abb1f1402672742672d47f3af9f8180fbed7787502adefde36db0f7a5cc8ab68c8010491254a32617490bfd721a SHA512 821aae3045979eede4a70fea3287aaad6f25e70a0b21be6ec7734b3b75f9bde50b009a2289cccc4718752261be04bd411e9d8eed07dccd4b7d59e4c6e69803e7
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3144676 BLAKE2B 5c8f4fbb92f1f8448d99cb5799b665560192606de0611e62964d4cdbcb620658b573c4bcad68c1aedbb5a8749d8706ff1737027248c1ed06195489a37f902c02 SHA512 9dde5f6cd56fe9a58c11e3bc9b7ce1eef8a6d7c625dbbdb6c6dcd382fc9292360c847d52a8047f6bb7c50101971b277244368b762eb358c43f3c2553457c2c84
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz 2965534 BLAKE2B dc1bc148b614ba1bc899bafb7f1dd2aabefaf4ecd4459a09e30a59a803e353d15aacefd8abfb639f3c3d4be1a02ab41f902f2fee99400ba5795c80374827090e SHA512 600af264902e39302d384c510fa1569bcc61d6d05f7791375590948872c9b76a74ce8a734741c6406cb694d78be251ae18e2c6a3dd07df924bb53dbd14d1a81e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3269188 BLAKE2B a268f047a3c531a0f730eda0bc6be29b112ec9fedb891be9656ef8120a569736123be05f7986cc021bbb21728dea1cd0d02988acb9ad7f58ee99aaabf856da8d SHA512 da6c856737ca9026e1b41e3d043a728130bb3fae9f045bf452ceca3d9d5b07ce9981c8de39403dac39e0d2d770ae63e2792e7e317308294da2f0a1126d83f452
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3188418 BLAKE2B f145824bc270aac05679ea9725514d1526b007520314d8c5789d2c823ed5f69e5dba9c03565db4a74ce3f465397583025bb68f97236a75542c7a5abf0f3fa7a9 SHA512 c35a927fc9c31e29b87bd6b9fe14144b91fd29130e503356f2c1c6a7ddd01fd919be23c296624681432caa905d125a90f4ca4c7ce95db5671b85f3a55723591f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz 3443888 BLAKE2B 78ae8aa01906f5c2fbbab72f5e63c27183625f9d1caaff45c8bbbb59b602cb4af7c2569909736df3764a7a52cd5565809cf9709cbdca6e09626768aebe57410f SHA512 50389ea83c825d780d0b7d65c7646f0c831d74f279be5bb4cb968b0dc102e4446cd1958db6d210fd4d73f386624d635dabdc8d2338ccba77117ba1429f8c9d63
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz 3134929 BLAKE2B dfaf95de2587e74c7ed93eebe609598db37e6e3a76b4e96203f8b68d1b187aac42495a8b6c3ef91435c87e5c38f821ae96e2d670f9b144e3657cedcc8b70f41e SHA512 f2dc51361a04c2e4c3ac39f44f83591c7249448ccbe1052ed0dbea3efb82542f67ff0da64dbca1cc15b79b24241daa7f6ce7c83b7fab8aa7fc687fd42beb80f2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz 3208890 BLAKE2B baec2aa38dd3fd92c36f78e0e09531cc67869d4c313277269334aabc9daa8b26d897786a60a659dde968f2a3020cd24fbc1121905babe8efc98dc0a19e12f5d9 SHA512 fb765593a1d9eea6fe58c9bb20044ad0e7554b6f24f4fb02b01c293c44da1123452517935daee71a94d3d96e89df14829cdf3c97f04a8e8cfbf964c60644e691
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz 3253932 BLAKE2B 3000e677bf88a64003e33acb9aa7836d7354d019b12004623f750c8c3fc5683e0074b88439d613fcc67ae1b7aa51081e57f7977940dfd5649a0705c4cd6088b5 SHA512 e3e023931c4c33d8418809fba50ca6e7be4dd821821ee66cde81e25d243ca3d18324bd16782f128c5b024813532c116672c606b06a6965f31dddcfc816bff49e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz 3757718 BLAKE2B 9efc234454a3027f23ce68c7e7df4c61507fb73a4e90765d55f57c67e29cc3c9c69410133eb53bd8d03a6202fab2b8052510a02833c001a16893f5eece83ed6d SHA512 b2df97b6fd496856827e9aed66bc912890c2ede44723af65c1a6cbbb9a0eb25a961b93ce517ea754b022db57bf454de6bd487396c98fdaf2e12721358ca2dd59
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3372282 BLAKE2B ea8a120ba9ad48a94f81622c19a3cc00eb53e30accaeeaf46629b49add7862d9a7b8685b05a6caa928832724a05fdbdf6a10a63c763d3c8ceda4e2f9fad0055e SHA512 c4493a03e8aabf578591ba7042e61b8d4ecc6173661350b6f08b8f1eca2cc81a6c5d1b26aadd5eb3fd09832ad3f5d09950834b8b9fcdaa7698becb80e0f622dd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz 3706145 BLAKE2B db1f1f93839cfdf005421ba3ae21e0701868d45848ee36bcd6b610aa3cbe8212df80d1399cf13417533951841c241431812bc248c264394e04f9765098bca128 SHA512 9134f8e5b2792c758d8f18e9ba8755e20e74fc30bf380286fec245772fe21ec0a059839aa2d6a24bd9a6bb4422290ceb8c31b80bdaa2e4b59bdbb00e9b056fb4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3338772 BLAKE2B f05e3bf9ac939c61cd3fa14a878e02d5e9604e54f207b69fd4757a5a6d3b9604f6e93f16597724592501f31e0591f574c24b491e1b77e5a3beb9c95c76edd120 SHA512 f354dfdf115321792a9023b90368e5f82dfb0b75233106e4938744aaca68328a3bb580de441e2cf5839ae86ae041998004b3a8fb861a0f46ff7072f7c22164b4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3255430 BLAKE2B 1ff5a8d16c129dbb1c53129fb08ea22a606bf6ad50b7ff19cdf597da40d428688e0fe4e70293a2d5a455f37ced303cc3ba4f3792ae61c0a3af39ff0d3d6fb415 SHA512 69d88a0e62d4cdfe2377d2ea1ddd61df16cda4fd8e05798cc53b13d43d28ba3cdd9a8f04dba641a425cfbc33bcf86c4c120e3dddadc7dc321e8d21d5c34c888b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3192773 BLAKE2B 698373d705371ec5b161fe07f1c6cadca1a9a9b315f6c8ba4527d7eb47d4ac3d32aee90886e222aa31f0d71d9a4d7f7d4a1c94ea0154dc370f1d60ab99a19a40 SHA512 e6f339f8c082d857449ae11aaff9c59c6d17fedf4cf72e80e9275a1457dab02ec8c2e034efe8a4561a0cfeb8f48b2eea35e782bafb65b79ed49c5784914f0065
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz 3483259 BLAKE2B 429bd0448dd33f385ce632cacb180f98daab29d60df83ab94e25cb8697f04ea9d9121f06846987d944dc291d1b0eac008ec93a5e5a1860a698e4fcb3c050f22b SHA512 67b272d16c37636d7499315e8633c07abd28b17ad4f78aff58813ee884c7ccc6af6037411fd79e0cb28d95761d3fc9045efe87ee24087f6ea64287e16118fd81
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3303298 BLAKE2B 6a55c97b0fe761f4ebfeeaa03bf790bb617eb8e55b2e46d2a046cbd0f53e91132648a5582eeaab07016e6a0faf1f36f27bee8c731e1dd87ede003251a37f5a3f SHA512 78315e0b60b9c06662bb0a1f4a333578c29ae9accf610d6d03ddb596cd0e7be74b62ecf9b56147e52025a820b6453640eabb070bb43f9efc89a171bc9c2ddac2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3193534 BLAKE2B 158038bdc26066f42a328249e6546f20ae2deed9984cb8357bf567788d8e0f48af573af9a29e577dfef4c4aa267c849f0a2f19bc49e1556af10020a7289a72dd SHA512 56c9cc6faa22e4a3fac4aa2e82b7eb60ff446f1fff132cb9cfd2f559b4e3ca018642c1c9104d463002dd9cbde11d6e79e8840f1a9d5b06bdd17b0f65c9722898
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz 3258653 BLAKE2B ff6b54c7b0c14c50b664b0970b65df7bdcf211c3ce6d977f8556e7a3d01a34695e88a7d6f0c4b24daa976b52f82949cf13ea47163ec6d03613a55ec2332569b5 SHA512 7713eee0cedb13ccdec76163bd7edebf46e58b9c2104a14d121adc69a54895f4df3cb4213f709e80d72077472bd292784bf5f1d8fef3b7b5e666e90995e58540
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz 3468903 BLAKE2B 8d38dc22e7111629c08b5456ad44b27a786e5bf1c999f9e4238d3b0af0db04489ab22ec413ceb51836bd0649b652ebdadd6ee7657d4af6f8d117049c6df5e90f SHA512 edb8a272d198be8112abcedee50aefc3517ac7f4a9a8ca4d055066e4fc654c2fe488e53a9f5c2d58950361cdc30cd55d748bc8f5b559f20b1547753328b6e389
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3304817 BLAKE2B d969f43820a02fd88d25b95711b48e6323e6d3ba0df017d740687151d7c96311cb0f6360cb4ab9118906e627bd2c8e0bd2ee1c0d9c88ae2f6f2b9db580f78a91 SHA512 c402761f960813f2d6fc247bb0ab3086fb722ac65b46f850c80f053fa8d24d390810db526bebf88accd00938ac90f48bcffc2a8c798d5b730dd235fa6a529823
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3266936 BLAKE2B 7623cb0595851ee8786ff8fcd3006661a1766deca027fbf3691c18db7aba89813aaddd4cc1f010540224092f42b6e08926efdb678957598ac72925fda0ca87bc SHA512 86a9e3da86dfd8d467aef521ab77b20c1fd910e4d5b78789eff00514dc8570135866b0f88ac8138f452f4f0de0e084215e3be2d66f3add87ed5a471435b912a2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz 3626044 BLAKE2B 10743d3f8294fd92388fc123eace20450a3cd45c6e6d79cb48279d44e339db7455a384b62e8c089e97f9fdeb48ba9c2482e2145cf148fbc4b4e163163cf911e7 SHA512 99bbbd3d8ecd4079f083cbb0b610c5278ed04998645a8a0b802e91e1a945edbfee257e9f5b76c32a245c1897b33316022315c0033a6db1072fe256c4d10d908f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz 3347905 BLAKE2B 7c807b34d50552c344dc57d822dd4c16ecdab2e276ca7282ddf2ba3fe77b761ace13cde070acc6f4559cc11952009aa929b9367f63143f88928420a3bb0a2425 SHA512 7324f6f9bc68220b4d4db36c422f2ddd63806d0a5c1e9da6208bd32b5f05022b585dc678a363ce30f7cfaaa21eb501df61b4c8202a0fca4e4cf1c34fcb9c8845
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3365573 BLAKE2B f696a3349b5560e7fbcb2ff0c477dc585bb3f3c4fea2dadbbfd617bb30f4d0931edfa4df01f5ad3916955e8ffd3f019bc1bc526eb74c38a0be797ef927c364d3 SHA512 21c7e0e68ffdcb5338e57ce82894695dc4465388c4fe8c919f002dad0c574baf1634a17ce08b76dfed4f53c59f2ebd28ee9417e90af7de618c1c780d8ee309e2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3248124 BLAKE2B af25a3b991617701ed515691fbd66a1112d1473654d33ab4c5187b318cff473fab84a1c0a5adb7d2ae0e49ff67fe181aefddfd5bd9d18e47123fe8ee8e27337a SHA512 cebfafce0c184398572c657ca8bcd69f3936d11490c43b9cb46784052b60443fa57022dcd57dcd6768b1b346edd3cc56eee4acf7ca3d81e818a36608772f0124
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3162329 BLAKE2B da2473d0bb8baf2b7a7670c241a7f454adf2b86309348057a42decfb45906f655783a7799a9262c964a945b22b23094cbb6b2fa1a217e50aee72bd5dfc1a9046 SHA512 de4661a0d09de1f0b3322131bc94bcae562330c10fe5c006f3bec5d7248969ece5e8db1b8a552b1d2ce00051ec53d6b7ff83b8d8b4423ea472581ede221dff55
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3238795 BLAKE2B ed61a1f710924fb69c7ef40a9509d5bb4390b8192c918b979074934810fbf593e44df955e429056d4a158477a565f3d914e10abd67035dd3be2712b4f0b015a1 SHA512 7917f628033df3846ab63c73f4d1b59ce34def6ae3856ab55bdd4efb8e2022df50c1b364fc94660eaecb3a41fa27104f07d14ff085689b310b3ab865156c5bef
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz 3217994 BLAKE2B 0a20bab85ace8b944df195e2f3a81f01112e0755c8089dc2933b0e956cd3a2244bb34bb5fd70443b7e9aedb789aec7bb793782a92975fe6b7f672a9b0362156c SHA512 7ff457139d85e56ee7eec1375dfd92f0c24021b4426d29f0d30c13908b5ed6a46469bf0f9a49c02fb204cdfa4c7f68b207d4f4f86a4c8d0cba6d9bf89e22eaad
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3298238 BLAKE2B 1e99d2107e9999d6490de68f6b1c7f91f8a1ca8685815a20a4acff02d9042e5b4babf01e3305dfe4bf680ca47986096bbaa9d7ae635206067eb309dae222f5a8 SHA512 11c51150a37282446a8cc07dc6df8965bf45a5d709f8007997f7d0df64e0b24bc7991e1ec0cdeb06d727367d925ff51ae3fb73523ac3b463bea5e45e9ee4f736
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz 3307026 BLAKE2B cddef88ee01deb9fd7bc1c04c5e9333618d4bd32a5233b3496d8902ef9c64bac2b404fa5df0eb34b0add51980de58e0e100f3eec5ef45af2c87c3b2ebf69cdf8 SHA512 6d30b6952abe3d35c446f2bd25868f6190e3b1f74d823a411dec6a80392f99cd56e35d4e9c6f42743c1182aa1251da2358e0f65613191a19087e1327acfdb817
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz 3597387 BLAKE2B 8318d71c92683306a83e8902a885254cd8b41866579f52648b0ab9bd67f592419bb6d40e2502400449e4e9010ae87fbcbb037cbfb0acd8445495a64aeabf6cc9 SHA512 e1b1c559dfa11388d1143bfe064f2d12b15d2883a528ae14840298fb3a394fe354b76fc743c49ac10fe986eb953bf7cd64dd6d950f5390b62167ec1bc858a930
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3285407 BLAKE2B 9ac6cff8024c18e1c29818eb1bd29cd88550e5eaa3097ed020a40f1bc13713561b0239489d033aac6e202a7fca20050cf54249f0cf909ef4ec81f9c26cd0953f SHA512 b8867be846a1a0ffae68b1e809c346dcfa493b38fc711819e53e106ea13a3f989fd2f83077434f45370c204826e202404e8b8595bfa357de325a8c5720257ecf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3395319 BLAKE2B c198bfb76e2358f3ace9ce5f4053ce7cea1f791c500736430fc45e69f5a15e4fca34e0877bbb44f03681d6c42b5a3e377a6d7f2b3e959d53a6f4ab6b92c92de9 SHA512 e8c83e6a293a4a15644ffbfff6b7912e157263765cea3a887a0195dff39d0a079b1db4f341dae683ae3d95f5ec5bb6c13ba8cf617bd4919192fed12d78dfa263
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 3525582 BLAKE2B 7a1774a7d579aebb67bebb5cb3fe14f2e5a5bc60cd5a41e121475fc9eed03de1c2b9796fc8b0dd9fdf5fe1a24d21bd758a1a193bcba0d2187220271949deae6d SHA512 31ddb7f682915f099c60a6a8df7ce77df1752317764980bda58221e7cb69d32f296cc23b2d3961b5faec6c725cace3e5ea13d874a26ee1a2921feb8e051020ce
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz 1085775 BLAKE2B f870220124e609909cc25cbbca753975de7b43ecdf10e5939b50cf5d26fcded0a1f0b7b67b1c9ea0a4a207e6a8802a7247b8c2c7fcba6e846c3cb898d57e5265 SHA512 2e2a734d4ba7d1a850c7506407b4a12f356cc9c3d2e79c9394bce1626d451f99f4d6c7e2dff3f62b5eac71ddc0ff3ecb2143add1abd4fc4ccf244af9051bb6a8
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz 771675 BLAKE2B a4cf0e7fbc0f1fb498725125e93b314b077bea43bea68097fbb135dc5105d8165cc1986b54b8ef7044d9ce7c04b3fc6b0f8b1a4a774e0d5cf7831ac369833a7e SHA512 a65a58d172e27d67ec848dcfa9e9ea29f64c85789700e1a17c9f062a2116b891e13a1de856d907809cd3c8a5f30ec17ad4e01ef27a23b395f27e8bf46ed184dd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2409982 BLAKE2B 75f51a7ea5ea39e53f98e63c56fe5df9fddf589288d6c3095de4844e974509b6bdda91fcf8d8032e9f938a74947352ba7882167a8a25b354034576da4a9371c4 SHA512 2106bb2948d7218fcc7399db82a80dd3e33dedd207ed890a9324f51a1c1664a173b0f927a8d8ecf26afbfce357bf1079a511eef2ca6fbcd947b8e425c6ad55b9
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz 530564 BLAKE2B b09a8ed4ebc60967b59abc1a590ecef817fe34b877460e61e32da54befbbeb449c07cc574f79df6eebc31c6f16e2dd94123e7f9f90dc4cd229f2cf1b8021e54e SHA512 12a0660b0d63e872d1ad1e1e34ca61a21d947fd7be78c3523c0ffb4ca444ff1fa7cda8a6c1328883ac9291fe59029f3bc252938ca5914e1dfb531d9bb4fbc409
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz 490528 BLAKE2B 762d97a0bbaa0333017751e84bfbcfe6593fc575e61de7e7dd565e277c86c7a0440181e641d21cc367ef3552a0cc74d6e0cccbb0f4f3d28e53c674dd6fc49f7c SHA512 7e89ae0b0db843def1d616aa3a518d4c05e18c1f724ccc51faff9fa72ae2a5692fb58ce9c3f28164d2f1977a0374572f582be3f3eaea91a0be52cbad8562346d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz 1048807 BLAKE2B 38cc129f9693b1ccd0fbceb7e3df15d18389bb101bd7c342e5f262e95c4f3cdb18893acf2f4193ecea56becdb589942b23d3db6090095753bd35afc7628289f6 SHA512 ae3154dab91023bffb1dcf6d7a2d5dcf216b8d4b0dff449028d47f21af0b5625ed3bc66690a6723c4ec33fa76d3bda9babdbbdebe234c2bf899673000e625369
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2488154 BLAKE2B bec258ad51d0822a8e41ed6b5209422b8750400fa12cdf80b3f37bc18321e9f02942c674343545cb9894aff8d18d81444d5182d10593706d68de7f8e86873c59 SHA512 579b41ef11ab1d4e92147a630880f0d3e27b0c43387661949ce1f44da4031a0c48b25506e2407b02dcf57f5c106ae5acc1d04a53ab803890b4ca897422c698f5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 643842 BLAKE2B 5d80346cbf35e8db42297bab6f4180b7995c030fcb87dd66365f5f190b326ffb60c899273920792d6ff08b2fa0c6adaa134a6806df5255b42c7a2f9ab7cc0a4c SHA512 617adc63044bfe2039feaba7a2b2357e1dff07380845bd76bc1a48e666e38a5034922545dfc5a741bfb7af8dde0256d68d16c9ff066d4d3806b6aeb951ceaf35
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz 789555 BLAKE2B 3169b84786b6749c328b3071ff54183ea50d6b544ec52d1f4169942bd4bd963be4477f8bae9adc26c8f938890a9138e1c4b26979fce7cef880dbe09c25e176f8 SHA512 7b86ebd5fbda1244985a1c15ba7e90e1b51e0169e19523ff3424d901d31f8dcacf8dc9de00fb61e29466b586d1238ffef45184b5177a56cd25c7ff7d04a44d82
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz 382460 BLAKE2B a7f84ea44b8dd5881bf2dc6e246d40490428e43c8357f9a2fefd3497dccb2d4fb33944487bf01ed869689436479c53723954461db5252e03fdd2ca5f3b00946a SHA512 d862fb00532d443cdf5cf95ec11fec388d1465f5ab7fbb9fcb6198195e182caf22b39e54c1ef53f88fdd002eb8669e5b64399bc781a70f35025b3c8c7d5b4cf2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz 1534486 BLAKE2B bf1e22ec92e111cf93c3458ea65c739c18e3eb2d8bf487859f13e914f19d5554abe47e68d045c122fc70fda0b5707cac6ea5546560a7ed3b28de39d756aaca7b SHA512 22bec6769e3089b009a30b7d0dc96f58140582a7abdeddfe031b6aaa3f62ecffd6a1066a3335acdb275789d8dfecf65474b56003ed4c71e7d397945e3faafb4c
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz 339505 BLAKE2B 09783f1373045b897a5af8160e9556fba07b2888e620e869c9aac3138fdbf3fef55e498be6ce489a2eb8bb286b3a4bdf407af2319174244fc5c1050d87765af8 SHA512 37269c1839384602ebddede5440c2aed9dc7a21e2b2d5d3d36c6033a7d804b6d9b6c3507c910f0ac68d82d73b83be2156bb9ffda8c67982dc91329cdcfafc449
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz 636271 BLAKE2B e2d5cbe0879ee3e703f60316d89fcd55093f2d9bb132aeb66ea80866921b323914633b0c875649cff6272820a9d23fbe2b1dd45ea4554ae994cda3c8795d2056 SHA512 4967c92caa0bfd0cdb3ef4efa621b4f9719296dfcc47c12534324c1946ba24848167c474d0574bf1e921a551e3731ae84c9f5c353e8c83d62fb8698661c30336
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2046152 BLAKE2B 35525a1bf951b2bd46befcde009aae8be168256a033ac69c0a59db4b7bf43607f7070e0188fd092c12fbdea94fc4220a06a911cbf797f02ffcae78b222b1c744 SHA512 986df7750b9a7345f64f4caee04041a18751598f1bb889b5331c7831e64b66f5dd46db54bc1c6569984a202b1fce824e0988d6e80f8e421879e87aa2d3b08fbe
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2045407 BLAKE2B 75f68b1a57544e3a19775132b9ec7144df8490537bfc330ace11212769537894153514844c23aa6047c56413aaaf0fe7befd662c276d50aa5c268982f9a8fe2a SHA512 8d226198b090030760ffad649f88ccf8413e60e05d0af96bb44afc82e4ed251f2627fd48287585f9ccab2cd983c0b1a71b357dddffde86733dc969a1e63e4a0b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3227425 BLAKE2B afb1dcdf00a04a55cb16a99c52f60a842cce897735522c26d88552eb0f8236f008fe3d8bb30493bdcff46c934f66390f40eae74f065574e11c61e7daa42f0c31 SHA512 ef80c99491aeaf37d3bbc11a6150db4a0f943fe8c70cb69961871b62da87a8b0c01f6813e60cc298d45dccd5e1e4dcde52804dd89587d955cf30eaa7480c8030
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz 766489 BLAKE2B e0bd0e99e72168540440156458f3cffa69486d7c4c403574f480eb31463c0eaf4a0a6ef2bb823b8299017f3a9f5ac96dfdbf703f1cb4cf9241410ffd6cca5df6 SHA512 71a7f1e9ceb16d855d0c728c2906e452ee6b8eb2181878b33f592b0cca233d8a08a5d8526a490a296a1ce3756c5b0c4f124f2846ddec080357ad716b45a59c3e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz 2864584 BLAKE2B 9ea633bcdf06904a65cd64f4e9e6b80314c2b84721e462605d78c66a9e235fd8853ea956a8414ccf7abe550c0bf69c9a25a1bf9f427e333f1a92994089a0f85f SHA512 b9802c167e2f30a3a00ce7dcde182fbd5306f159bbd75312e2c36ff0a1bbfddbaa527da51288025d285d7e5c322dd1a2a226068d280c2f90e810c5e433e0b567
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz 21794746 BLAKE2B 189760793eb75febfb9c83474cb5cffea342b06d6c7a2173fcb5d8ef1aa1b543d72a2090a564faffcdc66bc22a02505ff2023d14b11fa3030e5b3ce0a2614a5d SHA512 7c563e1ed778577d7f398b0da8f1ffedabe1c4ad446d4343bcdc063b1a672eb571c23425ca06c2a69c55d23bbf3d57c97941544b750738ea47dd63cd1da0855a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 441212 BLAKE2B eb9cdea63c896be172f516eb2eed82a70e48023a0e09732279fc8face26f84caae2255bf536320dfc538df4416910f28a0ea614e74174f5bd8ac5871125e132d SHA512 f775aa9c42c81579d37589704c12a040da6b8681d535f55c1fd1d2ec9428b12de8460bbb0d01dba0a7b823c30ec8cbe4eb2cbb2b1ac4058c18695a100719a085
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz 370012 BLAKE2B 2be26d1855895d705e10f34e8b4a518d05e0f89c1fa24459e830cd6f003c552838f1d116baca89f3d64e780a2af1dc71f11a130ee7262e1e00322927151befa8 SHA512 2e290831df5a2a4ec9c274821ab0258bdbcba84e81c1c5e8a3945c411b4a90dd1a72fdc7d8fcfb0dbd32d41092717b353b9fb85e00d52d697f3f34bf0dd0e47e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz 2875236 BLAKE2B 65592733dc403766be5b6efe917687c14414786a614c062e21d15deac75ed29e65bc69334de086a1ac9259b435efe43c09c753b01afb15dbc921efff268eee36 SHA512 8eee72c85fc819fb1a271e8258e6e06bbb7a48ebfa298fdd353e2a1b0386ad5374817b7b333ef137a6e3c106a56be3c70fae342068c16143627c02ffa4248447
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 7381622 BLAKE2B 4e90bb8c8a2f534e4199577de815a8603adb8ffd609714c0ae1841a9bb7f48031a62959b02ad93e1b422daeaf29b71d978ac156418ae6a29f7b0df5e476c7a26 SHA512 d72b2f0e63b195c3e818fc8eef6c4fda0c660717d0b8c8e60d7d21ccdc55d9e6eec6e7eb894ea5dbe4d1a6c355a9ab9cc313623ccc78ccb01c80973023e917b2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6929845 BLAKE2B a59b4ea247721ecab8ac81a3642b6791cdc2e2b1270cff31d3925f66bed273cd41ab1064007949249271e7ddd87be63ee26509558e750c8cb67c7f3630688674 SHA512 0bfc7d2cbce8fe1dce19dc043b3d47b6ad1c4a330f4ebf5468a4837b45f6d0131bd2349e6a345ec43366e7817697333112b8e98d9bdf4136dac23660ace59161
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz 762150 BLAKE2B eb23a7c977228d0005f6bc3cee1d6cf94a86e98019440d2926e8d9291d8efe3d0e062888f2da807ed3fd51d9b2e20ced0504ca06f8b42c0b3a0b0f4107124fdd SHA512 eae6f4bbc199e913f5e8591585b9fcba17d6a0080011fd8f66709d658641b57981c814f92391027b0499ca06b5d97ce74fc0520fcb864732c57cfe27cb411635
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz 2277894 BLAKE2B 9157ea00fdd6cbb26252e5387f5d178601dff7b920dea11fe7aa706923a0e9976a1389de28318892e88835d67c9a58bf01254262183792bf61dfdca472a17dc7 SHA512 5bafc2391162bdf488c8b12c59083caf492a5cdafce1740559347a97f773ce22a696f50215b9d50b147663e77362713a0ae381234c4d2ba8be2aef3eaf244f36
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz 1678262 BLAKE2B d0b3e3a30decbf173f28f778702d720e92f720e177ca8ae2aeaeaae15d54ba3d32a61e9257c486f732f900c210eb6ad3e788e7abf6f54cdc8e542f2f3a617a26 SHA512 c7cdd7be95db7c0ce4ca1e7db23d634422a0225186a6e77de0664a405d42627739acbf6f102f274215a480466d676961af293056e85f7ac84854f522eb37fb38
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz 772400 BLAKE2B ecd7b4a7c1208d9f52cef02702c2ec794bd52c900f337fd40b8437cf72f7d95ec0648c7f1762d43249f1ea252320b4cafa09247a372e53aa3462dc48e61814fb SHA512 43529a8ec078770d2142f6a5f847938f9aade128f10da38c078a0171b19f9c6eb1c737594c3d8840e2a1700de41a730446fa05dad48f7c30437403e38612c2de
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz 340069 BLAKE2B d0d92a3b1185e5c21b7321cbd7a44aa8b177c4128895058bc333c01d5689ca514e855a08431884cdeeea0a844281c23ec23859e4ff1686e04570f9cf81401898 SHA512 45dd08c05fe07e4f0e1391339fed533732ce07666dff1d2cf90f0c60eea89a4845e9f05ba8001f2902a0a9ce35166db322d0a73a2cf71dd3fe86741a1cf175c4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz 745246 BLAKE2B da8e048e9ca33de8e462f81760a36275c7664ad3c165bc06836c107fcf4624e9f3d6104301dbd81626c6f2e482f82da9de6e24e4005bbaf0405b25c1a3d49452 SHA512 a5fb0d9c9bc967136590a47af4c353cbde5471c39d6887601dc805c14b5a06eae1afcf5f0b64635fea8f42560ca4eb28754eb5b699abd40126192d9ec15ef7e8
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz 3073426 BLAKE2B 73ec4af3c33035c7048f028a6622a9bf5c37b51412e501ca40bc1426e704848450ea93729a82c886ab32a243cb84a82d27dc5b9dbeed4dc5066387a8f1c8d291 SHA512 7f5bf491e2bf57a1fbbb58bfe72c8ec08cae96058eacbbdb8ff3bbab5f49d7ec94f78318cd29a5ad8334b6f437ceebc890f6709f52bc3ea53109ba78bfc41dca
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz 737950 BLAKE2B 8b9cc4ee4e2e65a6b241c20158f8577ac5963e95a490940260050358e1d156bb0c611cd2660c107de25754889b2fbd0c2f8e833e7a2dd2cd04bb2e5a311dcb3e SHA512 b408fd5bdec5e48cbcef6aa4901246d525536baf3d63ac570751521c7cfde658783cbe05c600cb4f115203046891e4d26c9e896dce113225881cd9973bec3f11
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1792185 BLAKE2B 9ae12f72d334029b1ef5a7522a6021d0339227f1eb1a7556b744ca069c26d5587c3121c9df4f57d5b20671e9f4854c731cae103695b7be83562f365ed1443c43 SHA512 44b0212a1b1ddc39feef2f699148914f237a7325f6939246dc142ef1153cd0fd2471f542bd6a8e5eb37c2c8dd641ee98d4369ee3bd17a6c4b806dbe1224837f4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2664151 BLAKE2B 3f4c783fc81ce7b2bdf76261b717ffd54740b1db98d901d33a850af3d261aacee2eadd64e8f38cb2a2fc6b8226bc96f02fd9ed6543456bf17f8b759190abf571 SHA512 f228891815575cb98e05283d6b4178e9fb44056df21d28e68202e9c0286d1c9a37ac02dda152f5b0ea9d0b95078418a466d07c203b21aa06b61a8297f936ad61
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1227264 BLAKE2B 9f84a389fc493f6960a0c52e0b82b684b7263b3bbfee15f7b01bf35986bd956e75add333047f7a8b67515a3e70df17e16ccf451c2401bd9e6d59131e0489ee0a SHA512 9cefc13b66e4b821f6b6c3b20d57dc3296b3fe3b30c7c15448f469d5d370b9744d5fdc2be8c000a1afebc15768d68a817f4e32dc992b8a12a5384a574c410777
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz 520289 BLAKE2B 95be058f52647e3014770128bd6ba144e1588a8b5cb0e4b393ba363b5f98d056c08690b7de3a569bc1423eea0b410a081432d709571c542229c26cab98e73107 SHA512 3c6896084b7f5891c2653e83382b2f8c866522c2fdb76e48890c3976697aba6c2dff16aad472d2ddc2800c575a10bd8db1fa0f6b94b7da6494973ad50187bf95
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz 1638804 BLAKE2B b48157b436a68dd2b235980b1b50c3b06d0d8884a43850289ff990f50e68066d516ba8ea54466466fc152141ae26560d55b44debd5aaa6edb3ecbd5f9917bd09 SHA512 774ecc3c8019e18515408b06bbc926ae55450311ae30df3cd95e6ab3631e39855993796d53e3fc6a7bba450645017fe37c123680898bbfa0cfb1beea387a723d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz 569912 BLAKE2B 49538b68b633a97383d19964b87f9ae139462b7885e991c7d96df8b3b9c6fe361a83a4678860824aefe25895699ea8de0a98dc4e56783d1520e1b9d3f99c03b2 SHA512 54855711f3a5c87f6d93464e0c0a97f1507605d2121bf8baf8ea3ab1bbeab0a899216f9e4bc91ac9db3aab3487f35df95560e02a1d5bdaf02ee546c09d51e1e2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz 1004999 BLAKE2B 15cbc9cc37948c1b701f36e4a26a31240fb1fe4cfacd90044339b729806c4861f10bd9fe02f4f23075f52ec3f86269dfceab43a37b0a4047b380584e9f1fae9f SHA512 8729a8d7a768745c28e644d1c9e1d2f56e592c0495ba4df9fcee5a8622d7ff42f689cb389f8bea54fb03d0013f48f07d0a2e13ec7e5a9b0a724f1055719a26ba
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3043510 BLAKE2B f5c25cd09b898c00f3cdc70626c6a728c1beaa1d98f71ee832094732f7f6a8eda96420dce4d15a285394208d3cee48bea14a8dc95221fddd489279eec6a64916 SHA512 27f26d09b633bbc7a4d54b8fac3d9ab03eaa203baa202c209426307299bed69a83012e4112eee56d92fae78e7e0c7f20f1e39b466a0ffeb6b662e9bbc85985b9
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz 1629537 BLAKE2B 1815a552efe7b8d82ffe595ccb06c5ae57ce89365a193592d00185efec2b24f44adffa8e5822e954169732f87efd087f9b3a36b3dd56aa642a5325874e03804b SHA512 7ba193bbf71229480956e7f6beff30acbafc35ba461c4d5ef7d3d26fb532840d1bd0726aed177bc46c8e96c8d8f0c325241ac5002f11e447f5203e2ce93e3f3a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz 1540029 BLAKE2B 8f0ecdfdc32b8153a785310a5392e316e5187116ca159d5dd88142f9cb0aa9e2e087f64efd00393182f9a41f2761760cddefe217a7ad400342bb248f812b1bea SHA512 8ffab51218ab70f92a56c95efcea268bb0bd7d52eeb77941d2bdae842d4237e3477d75a33ec361417e8f7ce7df7501b5611050e5377b8671a30dbf44b8aadf10
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz 2105815 BLAKE2B b87f50dd22f4f24eacf886d841ba41c6de0da84cad50cf9fafc22cff3c40eccf4f7fa21c656de0a313ee1adb6c97e81c0e871779c40694d714c69b0b7d3e420c SHA512 f230f69a555b3998ecc0d83ca465c652f0f74bc60e0829b6166bd20e700bdfb613b410aba45d66b92e714bcbc751b4016fede4fa7a075da91bc5d41dfd208457
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz 821045 BLAKE2B 1d3731dad9f01d2bc39f3dd9a510b12762274456caa8555e54da266a080ce2c818bf818f630fae63ad1b6b8d194d7a874b23bc45615d6deb175030454b628105 SHA512 e348f03af5d5dc5c603ff7966436cc93246373c89251991e5554bb47440b7e06f9dc7c97123410b74962cba824ca4c05387f11b453e1c6a6ffc51c75f9636b80
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz 362414 BLAKE2B 3b3ff493916b3debd6950dd162c6d1b913f2866c25a1d0317ad3bce4b18e4ecdfafc6a28fc16e4cb09faf6f689557bc38a3200a9143afe04e922e1e0a9436c03 SHA512 ad5e3c30b83629a2c5cbb644dc3ec8362dd06343c8f1bd89ea51ac8b71dd1136c5a70de516f75fee49fd6b618ad39f87855a73e921039beb171978de64b10acb
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz 808128 BLAKE2B 3bfd5c6202fe8eb8185b22ac3d29c47e5841ff795c6c04be1a1935f7678bf85c7a62d9d60c94469ec87bb26b8f1754b4ff80fd428f9978629ee00247b5d75be5 SHA512 1c60c1d521efafd66d2655b2070d5a6e42854b884afedbd0c0241a08ffc09fa4a9a69dcd971c130439b8f805c124170879cb26167cce53388516cd68c31c325b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz 676246 BLAKE2B d95a021c97e8c9df336581a0c20ef8b8d2489742bdd23850c59e0aa81a8bdd73604504a069f62c448d06ba06214b0649415ea5b6f4dfe9d3c800489469e9c6af SHA512 ce8b501e670df2707a3831b07cb9dbb92610327d39d8d8b5b11ddee5b91b6c22b401828d13025dba18e516fe2faec5b828670982389cad3c800afe226fd8edc2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 339236 BLAKE2B 32791317b7c4ffca4a51ecafd3f54330073bd13089424e3ad290ac4c8719587f545df7e59728c04b81490751b13c2ab4d64a2283acc0cde29a40c0631fd9b737 SHA512 23e09e9b6258cf93d95ca6551ef65956719cabf03b288a972a8d45c30e7604f1ba7f186eb4db161915b0ef903deecd558b7545c7655312442b5c1492047bdc1a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz 582021 BLAKE2B a1fc7070173e198c6c1891c234fc09ffabb7335259452e00096d7457f6db198df372af77dbe027f0cf0a54ddce5278acc39986ef3b65dff121b01b8bf55b467f SHA512 71c91fd803d519e1b981cbd155afd162a2834e38cfef9e83535a63e839116fefcab077b7201f1e7f2c4efdfb1d3a8383e898988899e47cde428fd1ae2f973d42
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz 801683 BLAKE2B 1b2bf9752362173b81340b1b61f8dccc861ee4d6b6477a4f1659b13963a6d10a4f89dcca562382e10fb67648a9fc36f1e1ae72fef400cb01067105646831f68c SHA512 1633c3774b14311847fbea2c22ab5166ceddb4c57ff2a9aabcf2cca6f28f715e775d790a2690d2388dd36182cefbf0b19ea7c31fdd778b7e160d4e51e703ed94
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz 413987 BLAKE2B d85236a20afbd6467fb36d9febedf54bcc828d19aa250c516fab226a3bcac1701dcaa5f8591ca996043e06f728e131cd1786f00d06e3d8a8e1830f0f1ff0d13d SHA512 ffc8676a00966b5d0cac7da42fea5b1f2fa9ed1028c2ca016acc22a7b1994b5969ce539e1b4c9cb5fdac634c955fc252c6f45849684bd7355505fad63ea48632
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz 332659 BLAKE2B 6e467d3f7df1830eb1b71ec8de9edbf3f996a8a0724f9b0762a787262e6558f2bf6228adea34641b18d6255d2fde9ef8991ce08b82ef1d86da0992f9b73ee24a SHA512 efc828e5bf084a723f83e6752a0fc2575b1bedeae433710f80c72e0a6a03d60fd67e5b82570b4e9b37537e885a9260ed838e4d6590e9c722890502b4d4026cb2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz 148469 BLAKE2B 4a73489fb6a2816b2bce6d9372d2106c26a907dd99c25c4df80cfcb7063063697a9dcc86c5a0ebe2b31023754b41e4b9af058cc449fe3aedb743e7b639dce672 SHA512 7d478be798a3debac050cda069debbe360ef250a8eb38892f4c122b383c5acad07917cc4d3eebf6bec498468facb40ae6cb9b28349e73bd36ea10b3587f7bdc5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz 435593 BLAKE2B a272d8c47804f30ee60069f54d3557cb833b3bd0c2adc4beccf0ae76314a83860f7fa95d71c4ecaabfe677f36f816ecc54c7c254667358d00e509a9effd75c4d SHA512 fbb0c7d5e3e4ab6a956697ab6d69acc9eeb3310ed1fba704deee3edb7ccc833edacbd0a2cdc24f6b82ae0137134dcf6c0de4f4cd0c09bb19d40084d84dc5ea3f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1072806 BLAKE2B 0869de89fd9e82d420a889e5ee2b29d179b3cd4c7ca5f9b7698022c88f76b6e8d0a4a5212963956c4fb527e314041ddf339c6cda3ce0b2fed1a3dec98ca23384 SHA512 3c9bd497ef5d32db154d7bec7ced4d4060d61cd1a7e09c4ed7cb41fbdcb6c4f742f203347a9f12cb5af5bf2c98ca26d2dc90d43b03f5f03f6bc30bc896276e2e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz 1497971 BLAKE2B af23a8a6fd82237de55f849dcc2d5111b5d150e970f16f246d428fa03029e2f821663b0f83b50fc1bfa875f2115970eafdd5958ae1a3daff10ac503aeafe5d7b SHA512 7b6ef7a1c36b77d3b932430c1843523feb8f0d81a9dae6a399259fa9ef24a795d08500b2267b4a54f33c01f0e94c8145a4a80792074430ed220a23a7ddd1be55
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz 334590 BLAKE2B d557e64b0725a268cb58bfc7d417dd2ecac361330d636ebf58b9a068ca54785c25bedd785c47a318f961ad3dbade0f921e77e8fb1ef2f3fd9e373ee473c98429 SHA512 7ab192365366a61d46478ee627591798b40fe478e12fa264a422506ffb0469def3e9e0234fa18378ea4ce5ad89433ab0e26c0968929b8bb067a77b5caeba1f8f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz 386084 BLAKE2B b907e4639522cbea862fad267fc0ead47d844289dac60733c033528bf91e0a5147aedf68ddae77ffd2c17d2110f147201aaa6ddc89847d0912557a4d55e12744 SHA512 1ca202e60144f0a9de21c0489cb5e7f1b0e684de93c659a91e38a7c1d7c9bfc87d67d5b152dfa13e53f07debb4127c4d0da64e74d1b174d2c59a74ec1bdba6ae
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz 541112 BLAKE2B fa998988decdbc49026eab3ca8f008e721e6328db21535f021dee4d7474666a8baf13ff4d943cf1093203ba7fd53f891a14ba8203d2d26671f4de3a51eaef71b SHA512 e165290aa8946f4ce0b267b14054bf86e4080b4ed2f2e3dc974d1fec221ecdecbcf56cdb1782a8cee9811996527b0a25638ed36df318f15c42bbfde3c3615306
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz 531440 BLAKE2B c1891078908bc3633e14b3d5d5849d27adc156f2f34698611ad9204fcb2bee44f540a95fa8ab532808a84f21bbeb4f56ee9d7167664b9ab31aab929018115557 SHA512 05ca5a5055b8fdc5a24fc070fedb68a3f032df8668ab0aca3ba8530425a52f6bec59cadaf25d7c50268d4f52c4f028a3472ee5ef472c2e4faad8b8cf97506963
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz 404511 BLAKE2B 7a6a9cd287173e2c28f34a3b8b297d51f083bdb2f92ed31332ced34bea393f67c6afee69113974f89af79fc298b291ed0235c49fc4d11f41e7e342c52e512202 SHA512 8f57be18608b3df2c1a93e39ff7b382a25266ddc3bb97e82402fc822de7072f4095b238219860b6d029e288befa4a821502e59c2cfcc8d774ac1d95bdae5e57d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz 575839 BLAKE2B 48869f92997e3dae2cd2304499c938cc6c738a25fa63b7d0275ca9050c67261b841db10d5ad7cb913f2dcc4a213c3b4a3b3c60a2d3e89d8e7978851103ecef2b SHA512 70218c831692b3a83f6ef90d629c9aaf39578b528a7bb0ae7e63ab9299e19851a243d23d4d6eaac24a0cca5e78dafb36d0e5208c76c65d259e290e72178bfeb7
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz 465513 BLAKE2B f712273fe8fbb7ccf43fe66b9e678bc2c4ffd3731a73283dd972a1686a4bf5beb92c7e96838c56fc04b4c864f20846686c8e1fd4767ad5896163fa25401efe64 SHA512 6032c0f1a194a0df1d9e112d791e8601aa734d9b008bad89288edda051ad16f3e4b95b148cfea7a8a23906375386a0df6bfb6f36109a2d077646df3c70830ec6
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz 4107373 BLAKE2B 5665369768b5f4b874c5f9f108bc6bf738324a6799e74876b084c4cbef633b69e94ac414075bc9f8d863e3cb6e9c02b28086b5c7bc0e4b8ca596f34b17711011 SHA512 d26bcbfc25b2dc52ff559abbb4b04d85db95250cacd6eb893e44d8e359beeac5abb31a460510d969dd113720f3b4e26132c39951d478445f6b924e421cf48c15
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz 845425 BLAKE2B 160491f0e87f7f2faa563e32fa4e3a39ee0c1f512104d57f62e04fa73d4b3ef82f1da756592d3589c2b1772e540cd89267d47fa90cbc6979bd6c907b6cade93d SHA512 f301c8f5d981fe611a2b9f26b52198d51054a1fa0d960ea4f2a277716c4f56866540d18dca19aa433c086516a22faba0d05aab7c55331e92e14c226384bf33cf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1561961 BLAKE2B bda7d521f85ff18fb9062aee4fb323f7bbea5f69ac56d89fec22531d51f66f923e3d0939a04c9767e32a4852154da2908be52b4e1f9481e0c7a4bdd4cafc9e97 SHA512 179f696fe8f9e189681620a4f48a8005987670f84d6e585fd623ce395beae83efc40cfa3b0f245e1948f6473100a43bfdc745510886cb0cfefa619120cbee7ee
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz 4105951 BLAKE2B 6e076044f28ff7a6344f364944b0ad8a9f4afe9c71955d15a53c01bf52d9da18316c9bae89a3a3cfd7ca9ebded51b727d7d91dd550be4a0b4b58f8e64a86e13c SHA512 2d3a035808f9b8ea76da17d51d83a3ec8cec3f21e4d8619addc0d829a94a790738ee70dd6626ca12a1de49e1657fc6600c11c2a5cd0aa13b4aef1dbb6a312261
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz 282236 BLAKE2B ce878cc147d3cbf58907cbac65989f137de5e23a7e2f42c0121422fef85f6bf3da4069a6d20698200b5bf27629d27d78658054188ff8cd6132cf0eac1f3e73a8 SHA512 dc60c642392cf1551caff543dd6f1e55bd2274ad36958fc4e3760be69702950df7eac983cda240e918d3c35cb0d42f0ff1e2422eac82846175709aa5c7bb8581
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz 324568 BLAKE2B 6b44361448a4e09d3e58372163bb382794db5bb16ad16c967a701c94de077dddff732337bbd2cc2ab6b8b4f85b1965055325c03c9f7aa8ef8053be5969420b76 SHA512 d635686f7f29975c2b7c930e2efaf6376c4441ee3bb10278c9e7c85f5dd5f8d73e1a1fd324152427520b9bf8fc0496a52802ddadd52317143912239b7962daa1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz 884671 BLAKE2B b95ca69ca6b2b09ea8cd94504dd6381e6c9d11847bac30f31920dacd66b7a22092afe07477953ab4a281bab1012b8bb3e570468f0755e423d2272a236ac4238f SHA512 f198e017771c4ec63af1ec3907185e85ad8b3f51d16cf26b4e4dfcd3dbc62a475cccfb936aef0a277860f6082fe482baa2e676096d1a8aab006a0a672c55ac10
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz 372890 BLAKE2B 251e39492a5d27940623b8c081d46f34092395d7e9c25c7713ca04c0e5ade5edb840f14a989c25426bd5725a028781b195c0ad5a89cf832e120c26d6158226fb SHA512 b88b0508ac2a7e2d4c8892012d483479896864f8292aec9ccbbc035e1f1da0c4182c86c3aff9dee14c88987cfe2e512d58211f335687faea25cdc4b4c7bd4c7e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz 599425 BLAKE2B c5f191af38c97b09572195c2ede5fdf3113d969e2cccf34b46615d0f2eabf217a7f2165027e919e37f56720e420ec18d7a1976e6453395fedd17b783d28acace SHA512 02b8a7a82e39a8e5d9698ca6f4ea96769d1026504768b3829701e3cf66b19b0f9799ed88011cfc8ec95d29c7d367259194f953dab212f929988f3f56d057040e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 475828 BLAKE2B a5c2a5fd3678a05df51651d0ce22d2b30a7022e7452b46ec773f05091f740dc8db5719d5f8f2bc9b96c23d48dc1c83568049eaac7f96f4fc5ea111e89f26b730 SHA512 c9459a50c1d5c6694cf89e65fa511fc674ea5a187c2ca66d3897424fc1825f487f02224b272d1eeb5cebfec28113a1cf1e4e09430e7a56a7781dec69173a9a59
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3133919 BLAKE2B 93d4183ae1f384da0baef7614c96526306444b0927f17bf376175d75903ebdb79e28bbbad8f7deee71f48d5dacb52a48c04e1f41f7b1068689cd84f015584dfb SHA512 02c9d5ebdfbe5bd08676b8b4ee31b516e8b81741dca5cf94089fb8ffe3d8bb5bdef9fe998e8b34a8f19e5dfd773b057036b24727f8e75698b428e06f499d723d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 2852945 BLAKE2B 16d0cc78c9c7e18373518f55bc647ae4f0e5ac7675b620b9aded756dcccfc5ca0bab8e0080538e4e89b2c71f4f3653052c81c59b56540669784c7aa3e532edf8 SHA512 865c2ea55d26451467522b0e37bdd16187f440356d4566f4ca5090d4e819d6fc57e698001a066112bcc302b9e4ea1b32e262a5aeb2ef22e71af44bbb186e09b3
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2407951 BLAKE2B b79e9c2b7dd5eab1da093e21e6c75417cb4345aba495754bd71d51e98148486b4013913360825d205706475f99af6d45d2e5e9d5c7e2cdc2d623ea17cc9510b7 SHA512 d12bb24e4f52144b73207644cea2b31f92c72318cba0ace05ad1bec9dcbefc536f7cefe1769037f1123d226c443bf25d4243fe293e569fad8275616748f2a667
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2522585 BLAKE2B d01c63bf12c26de6d14e61b90a0ca9c6e25ad77af477e3446dc285337161b6f88af9a08e1deb00ec1826c3bff6add1dc2f1dd9438a11f3b43d447e4bf6278b57 SHA512 f358705dbdf917c8ce0d9d730428d31c1dad3519f640bc4e3e0fc04920e6bc85e7d87898facab40b45182968a7b52a8fd5cef316bc52f8a9568d0136330db3fb
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz 1941390 BLAKE2B ae460c6de978b691822501eff2d3eb57aee89595953695ce14f9352820b6fa28b8e36b04de0e15eee0d440664c7531d21d14174a2142dd8cf0af1f9c562bb9da SHA512 a6e2c198eff9a93c0c1eb44e49392dc4d75c32bd6ddcc24ee8fb18e949019d1396aae84f3bd849431cd85add4433e340503348b2f92ac97d916f5b5463b29b64
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz 349176 BLAKE2B fed259126cf062b7daf2f471840f16c9db738dee002cd95b2e285ae208d75d480750dcd2b3023e7f1b68ca8dff8d1ff22c9932fbf4b094e03eb014bb0fd8794a SHA512 62bd6013e2ced0718375c0d7aaca2641e1987de7f3f7298c501f87c30cd5ed1fb11f7b9e07877f1aeca5637f994b022265ef05064ab0d96d7686743cf0cf5fe3
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 451411 BLAKE2B 93a7429483a80a1cbcbf8e24923364ad72184aa66c4ecc9997d84b164ac2939423e1458ca39da2f8870d9e470a171ade1b146aaa6cddc3945e3c41598f22525c SHA512 d17e7a914ede830a0f973efd1860fdfd46e0dc6fe8e34067817406f335b344847de3652917c95bd697607e7d0348a14e0a5f245e5763451d960a6fd7cac3892e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz 521555 BLAKE2B 87c346afef7b4fb009e47dca369ea53795f9fdcab8187a6f0a1ad26f1c25c83cd6fb9cde44663e18684b802f7633740e73f3315fff35a1711c3a8095266f6d25 SHA512 f6d557278edf9ba72054f03332399fe0aef27d1e1c656f86f6eada3e2fa8acd0a48b5e4a4ecbbff7ad46b84c1bd6fd2169b4a96c1d34a527f26e4d986cddd7a6
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz 438553 BLAKE2B 888ac02c1a5ce794c46e336eb851266625efe1aa7b03a32648dffe6439c9f0e46b287318cf658e182412dc5b9dbe05383f2c63527bcdb35284b2b06140556e0e SHA512 5e42c70dbb099530a250c2dc5e2e9fb05eed68c21cd203ec17c0b501c9067e6840366d13307c7f5b3d87a37d7ee12d4ef18c3e6261bedd0e1062c8fbf8a926cd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz 738708 BLAKE2B b86981aa994c42a2daa2f2fe244077c128163bd978f56a589ebff55c08a6130ae272f7f443ed0844ff48734599f312f79a1250428483ae900b9448818ea78f45 SHA512 80968795f192eb8495bf0b4609004797bb942621ac8ffbaeed1ee9b46cd6fcf1379ff3e3eae8a733bfc398211c5c7a2929c8c8c23a490f22a5ad016d758a6540
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz 451384 BLAKE2B 28338b0cc14b1c3fd5ab8b907799d5f27802fc8d387a91ce1976f60116c11d2662dc2c86e8de9f9a194b91ef6bf5c9fa375c4a0c9bbd28bf51089b6665914afa SHA512 83811038c342c11d3c035626ca1001e7eea678fe2bb34b3de1c49c66067411abd3f29184b3fc68b535330267bbea07361010dc1fc0539e64fbf1f19b80d7178d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2049744 BLAKE2B 9c7a6d62036dc9436c0a3428276cce28013262daff07338ed24c625a86b919037ec3001e2bd2a81a780e4ebd7a392d844568758f2677186c7fcb654a33c17868 SHA512 5f52f0764488426784b80b252fa0a94839ac4133dd324a22523385697efd56618b37ce0d31669cba0260d5451ecdab423e39086e8062c6662a932a9f1d5d193e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2500684 BLAKE2B d958cb53b02e4ee4d9cf12c0f6a669580c65c971bd905f5997bb748f8a288ef148c96f0a1135b86caeaf37f76bc587aeab97f868b136ad73c8d1e1f475740682 SHA512 1918fb985c1aa0812d3166e047f77995b45d2b76255fceddc2bb4970dab34652bb832ab859712602befdb0da63ad03e6f7f656d13904badba05be7c56aae4fab
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1175448 BLAKE2B 39813dbdb682e66b0a3f8dd62e3feb13bde54f68b50ac73474426271669924ce873e071e930e8ea132053f1dc7e6e8ce6b9914b6e3374ec8004e41aab535ae84 SHA512 26d8b089ac28ede7899d576c4ca6cc33490ca8c1da212c9d69a0eb8ddcc8c5c5ff4ed755d38ffecab5e24858e2c652574f329c09a893d1ce63a50c1c05ddeebd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2408994 BLAKE2B 023c4183a7e21d044e92074fd697fe9bcd432368c4b9b3bb268b4ff2d2b1cd98379e0e6ae3e789a49ae85788326301df71c01d68d63bdbd2849c9a5ae68ca951 SHA512 b3d4055e458a91564a2647f9fa916cf70cc4a80f0ebba7d088f7002d185910d793772cd11f730c1a38f680697d28717885bbf1e60a91146505734ff6cccca1c1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2471789 BLAKE2B 1689427c926ae85b5705bf62fdcfc556952b766ffcdb5318d5585e77a8d69a8813d38ee19942842b142d8f1fabc10f5e4780eb8c572cefc0cdfc46a8b5516b8e SHA512 b8ecd3df2e818a8d702df49139d6ee0f12966d4b5e1443a35f037cd6701ca347952cce10ed04c5a0bbba1cf476eee18861d878b83ff9e57bedb850a1189e65b5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz 289688 BLAKE2B fe7038bda09b0db62fb2ce3d3d8f658ee2e5ce21f97c86ee04a169e26dbd5a8874394ee581d14002041b65b513858dafdca0a94513fe1a95e418343aeb4ef7eb SHA512 a5283b58214cef630ea38642b9051e85f0efb061012a101c677fa5690d87f7ba00330888a4c839857d39f9b3d5ce105e82221a6af847d1c49b31cc3e2b5039ad
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz 283359 BLAKE2B 4279222721695c892284d265e33cb61c1d3f6795fbc93e45c9c867db9f800adac02f0bd3526c1bc13bf2370dbd0147d92595717fcd489ef60944e874101ea722 SHA512 1da8a975318247521f0155d06bee5a147049bdd1d8528ff9bf2ac7c87cf250e00cf7645734148822888b5bb1d63063a31bc55079a24af27d418978f8cd1df1e1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2637161 BLAKE2B fe5f3c80b459cb4a2bdb02e1fdc3c31aa86fd3530f0478781f30998d5c3301d7c39d0eafedf0d52c0bfb3db9afc98a9d344f90e98322d47a38755b63c58cbebf SHA512 9a9e4ad7d6fa408fce2f6850462989db5ec674c42635bc35fea3eb2ae450b1a5f4dbaa9d338e80f10d5a7f3b707ecbe3d02db35f73a47d7524689bfd1b9a2414
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 321827 BLAKE2B 3badc0f8b9858fe741bd040eb69a35cc9e9825af02ddbf899ec188e530768472d5a60101f13f10793d97afb2c070cd57e6f5ae0d8d2fe6e210bae96ec4c283db SHA512 b2775583856ee9b0965d2664cf57fd256515c52a4be87b873812e36c644febf356fcd95fa2956092d8b5e69fec8274d149f96abc1a0a8388ae7f0d248f96951d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz 680427 BLAKE2B 3ea58f008b4cf96e1f5d36cd4c177430762314ae9796a72db7056a0f0afa392361863436a0b2e2cbb3c622f833ad2c20cb29d594bcab8b0a6f7e77d3be1c2970 SHA512 e434007a89d8747d6a2a45c5ed069f3a79538336f7d09bbb3500332e308a726335f7166818abd34ed3d42861fa2fd93198bcce20acc1ff5ff9b072d8eec4d91a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz 1085827 BLAKE2B f4d211aa46fb45382bbccf5572d32f236b02d349339b6d535db7548b8396484c24de13b777982646dd5692e5198150d7f056731e5d4d2788a1e9014ec10113cd SHA512 2dafcbd9a2577676b56186d8e9838e42c7aac16fc337a126d3617e01e3aa533ef799ebaaae9f6796d832ae7f0f0c9d3d762b5c0a2434e76cb613718db78630ba
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz 360841 BLAKE2B 0ed3dbe14281705eea78a58175f5c81e29f64b7263f50c2a7d0e03a05b1075a07a7d75871cf2ecf4eaf202cd6739c2320f307ef59469a5259ee3f7674a0fda42 SHA512 9acd1869de192715d3451ddec99a1e82111d6006a9c8c4dad9cf8549aa3155785184c9a7418b444f8182938caf700c1847e3eea9eb16ffd7fb4d30781d77da1b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz 746983 BLAKE2B f529235b3b89d278fe3065c2c23b1edae702582760cb76bcfe98f1dced2b74109414a1dbf72a45b86dbc61f8b0ffedac140ccd0789fcb575e3a83f5a3cfcc775 SHA512 1d00516ac58f811dd2fe6bdda99446edd397b109d962f6870fee740ce04e715b3ce8e5570306a42f902436bd72a3eac7f8bd8a9d273b9f02ea63c0d15e682214
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz 263852 BLAKE2B 58fb63aab98a347c5f0a0073bac4bc02c6cf3fb8638c219515c953a836c307df9b065b2b4e0c1b7cc5e0502d7776afb407a252c31ba91f63ea90d1fd56db9687 SHA512 eaaeb728fd62ae261c4c1baae405505bfcf6e8684edc52baf6a0f9123f03d9fa7be365a895d7074190c3b2b26aca3aa94a71e3a224aeb563f9553f6e04e1e8ea
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz 781343 BLAKE2B c9a289786f8fc809c51f281ec7e80ce1a6b60f821785b291878882183295fec529731618f9d7160a0322721ac4a1d10cb182aec46a0d29dc37e78302b8d138e2 SHA512 e165b741df089886431dcf90e7f94758c0c72df5d2141d9951064bb5c5d1cc9d528d837cc47aa43eb34b96d13a3b4fd0dcb8aa8a4f3297efbe2784d2eda39310
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz 281965 BLAKE2B 97ed5d3359e0e5d4b7ab0743ea6c075d3f8dbb7003cf7f7c6764270637f4271f73c30bf53c2c017ab1887532a1b29ab3cc1a2c0d0d6683cf7a87bb0b040fba7f SHA512 bdb0e3a15af06b6f2910da8ed1098ae83ac53d503c8c63e9a8637d8bdfecc8589560c8dd271c3ddaf3b4bbd5006a175ff882d869c999ade5f945a66256c94baf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz 188291 BLAKE2B 2f6abaae832d295f3da61f410fdd773fd212198028056443f6bfd142a7257868f5518eb189acbb9874980672f52699f55cfc2499a0735a6f552a504166b944a1 SHA512 221739f9d35ecb5c77d73e049ef16644867eda55edf573cbb6fba36de47f32338463092777f03ca004af42d02e69a2304f10260206d52a0e0da205f8d8195132
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz 547441 BLAKE2B d4f7a7e5a0fd0ebcd9e8c5e22329a8c5c57b8d9d392d9d780ec2d847fea45c963c45f54249fb49d358e1ca7039d1fdbbcc0753c333e8e3f63e0df5d5cb7bcb48 SHA512 d594df7cf4080916111d92a2504dab7a0ecd2d79f6b02f54ce7fcac812721ecb8355a1f81db4a6893de9d50b711fb988cbde8dd95a80bb7102841da05f9f50cf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz 1655092 BLAKE2B 401347c8391e213b257218288831202475804cf1c22170ea4b9c50e5f061e6345de5471f310547a616df2e91e46fc427c15fe8259113890c6b968365154d015b SHA512 314a2b1ad894860e0ba80465e4d384473d45328cc38ac14dc23cda48f0215da160efcbc43806ee01e8df3d8d4e43773c3c862113e55a55eed742ea5c4a46df2e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz 317091 BLAKE2B d4db88bfa1765ff0dec367dc35fd05938cc38f5d4ce6ac3a080cabf97dbaf8b5ff53c1edef4984dfcaa49dccbfbd775da6891541e58d486437398cd68a91099d SHA512 1a2917e5c85046181d1013ef4fa94631f044a16dceebef8f72374534f25f93b96e438bd56fe06c14191856bfece185c02885f961e55a4f9dcbf7aa67a5cbeb62
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz 286292 BLAKE2B 2794ab904bc08f67164b8119e8fb0b6befbedf53825698b663c5f96a016b939ed1763cf3bf8fb801635d6bb6e067744126b05477be8fe0800fa33ecf1d89ab0a SHA512 b0719a25587f2460e9987b6812d8997d1cf11a1b3c68f6ec1cfbd9eddd0b532f370ddf141296099b6d77672352e0a47ee123d3eaaa8f8b056e118fad4462fe7d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz 459744 BLAKE2B be456df7da1e21dc72ec2188629ba957f6107129fe0b22fdbdceafed67190b8e3bb98413552a54d0de0c54f963dcdf9b4ba6e962eb2612fbe1a0259428933575 SHA512 f036b40e09a985610b5f86772e5910d677b9e5fabe9c65008019325665f761f32e13dcdbf3e3cfadbfe55fbd9ecb18b22b2d4951e84b8eab14e5ec32c0625d7c
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz 292841 BLAKE2B de54353be8a61bb0b1a54fc1c8f994d92a2b5da3037ef2b4ae2eac61f48d8bdcbeebada69fe9ceb4e63cbb542ff2cb18ad0a22ea7510df2e7f46de479d5dacde SHA512 6325c59a4bcf0032c3fac1d70011a11726500903bb30abf59619c8ffdaefa5841c79ccdc9173ad5d00524392b547ac9043d7f4c5631e6a23eb0bea31521aa671
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 844811 BLAKE2B ff9efb6ce3208c52f9c4157de8541f3ac660ef95da1bc635625e7ec4912dd896cabf94254409a3b18e973ab75af69001e2e48f78ab151dffdcd93704ffa6f26e SHA512 2fc8de8aabeb91aa41baddc17bc4f8c257ca37e82a6d2f9df95fdb4ab6a6b732489159975614df0daad9d09a7dd33ad4e97471b22801b85812cb14d9e6465243
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 845987 BLAKE2B 0d99b01aef5dd828d2cfb23c52527313de15fbd9aa197d3351977fa571b966bdef5a3b06f7d86625d7bb4ff8987ebf23a73449e645ec125e924307a7031928fc SHA512 a1b6d235bb9e0e85d80a5b4a993520a94180abc78b11f26062746903302d2561ca67cd63441b88472cd85038fa132eaa6f0533edb47768e0e7df0deef05fdc05
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz 323261 BLAKE2B 6d77026a0f011c371b5b42572a7a2cc3ef6be22492b138baf29735a287939bf76f159a37898d687f60b8b9387a89f9ce6de33a14b75b83f71b16219ca24df6d1 SHA512 11313d12673754c8ec70b3dc1537d8737b5a8dd9da81389163d6d3f1d59d359f261697e1ba7d259d49723caad8fcba7638a3ff7ccff3d7efabc455f12ed787c4
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.4.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.4.5.2.ebuild
new file mode 100644
index 000000000000..9c65521b06c3
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.4.5.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+BASE_PV=$(ver_cut 1-3)
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people who do not install anything e.g. no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in l10n for some weird reason
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index eca8e76affab..3bc5c706672b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
 DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
+DIST libreoffice-6.4.5.2.tar.xz 236255044 BLAKE2B a83ad0c50d1b7e686188c35c5f319b73e7984ad214e125102824789d1f56083a4ed8795cf7d8942fc0b3ddf3cad13f326225812458007a97a166bc5543c47eda SHA512 f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
 DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
+DIST libreoffice-help-6.4.5.2.tar.xz 88376816 BLAKE2B 8c5f8a3379dd77f41e3350314fa250ede503d998afda3cb2c8c95a4dd3b565bd6d0004b4dd7ff7b079fdb4de766fa105a8dbbd49b5ced5587e5a716aba31ba26 SHA512 fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.5.2.ebuild b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
new file mode 100644
index 000000000000..8d83fe8214b2
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
@@ -0,0 +1,566 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	# QR code generating library for >=libreoffice-6.4
+	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
+	bluetooth? ( dbus )
+	gtk? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.15.0
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? (
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+	)
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus[X] )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3.1
+	dev-util/mdds:1/1.5
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.8
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.8 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+	# git master
+	"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	# --without-system-qrencode: has no real build system and LO is the only user
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-epm
+		--disable-fetch-external
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-vlc
+		--with-build-version="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-jfreereport
+		--without-system_apache_commons
+		--without-system-sane
+		--without-system-qrcodegen
+		$(use_enable base report-builder)
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable kde kf5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2172decbfc67..482dde4bc2c0 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index eaf132652fad..7b3a42c89418 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1 +1,2 @@
 DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
+DIST unsymlink-lib-18.tar.gz 10807 BLAKE2B 0c15ba8fadc96641139db68068c6402f24bd9129b452a8996c393ee899b274e7a5c96d58c2745b74ec3dbb469008a6756041b153abbbe3f29aca5f93c8700834 SHA512 bb08f1c35046d756aee752c7cd28f8eb93c562587f2fbc0070817c11fd42f3d12fade9c8ad29c508813e10993f5b622c9d33da52e49dfa7e16b1997a72d491f5
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild
new file mode 100644
index 000000000000..03c0f831738d
--- /dev/null
+++ b/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-single-r1
+
+DESCRIPTION="Convert your system to SYMLINK_LIB=no"
+HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
+SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# tests are docker-based, you need a running docker daemon and you
+# should expect leftover images
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+	')"
+
+src_install() {
+	python_doscript unsymlink-lib
+	dodoc README
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 95e50f946a9d..b82900d4008d 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 1bbcc4647739..1c33e1fed403 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,2 +1,3 @@
 DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
 DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e6ca54cc816cc89e29e9ad65b5b9d36e94fb107139d4d4afd400f0b33c35eb824a0ca66dd7ec66b6b4eb25f7d SHA512 55cc51d32bbc47f3ec1b33aeb733fdbf4194d5cc8ed124a3f3f4afa90ed6f025a7684a8c1babdb5b5a65f716eb76ea2a6628261523b00110406b94f922ba825a
+DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
new file mode 100644
index 000000000000..bc21fe17a3aa
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Scripts to convert regular ASCII text to man pages"
+HOMEPAGE="https://github.com/mvertes/txt2man"
+SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="app-shells/bash
+	sys-apps/gawk"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=( Changelog README )
+
+src_install() {
+	emake prefix="${ED}/usr" install
+	einstalldocs
+}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 69c784ffd199..5d9f5a6f5de8 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/vim-nftables/Manifest b/app-vim/vim-nftables/Manifest
index 376e4ff01607..557831dac591 100644
--- a/app-vim/vim-nftables/Manifest
+++ b/app-vim/vim-nftables/Manifest
@@ -1 +1,2 @@
 DIST vim-nftables-0_pre20200224.tar.gz 2427 BLAKE2B a17780ffcabd1d323f3ccaa52e9726c2d8dc04583003fd8eaa799c897d1ccb1718a2ef28c2c06f0108785bdcc90addfb27d54f73db8d9f59b225e34c244cf179 SHA512 05dab5d9bdaed4ae1de9e00f2d6996f4350d859af73062d00417ee6567041c0a3fa6f50996fefa64e7a2410779b254ddeac1d5a893aa2f664504278b67fa2fd9
+DIST vim-nftables-0_pre20200629.tar.gz 2440 BLAKE2B 39a80bfa54b378896918f3703edd452cc3d9d15d15bc6545dfeda362726e8dc1bcfb1f2008d5c1236f24b01dbc17df59ea14928550a3567b57c74407c7e97d73 SHA512 71ddc55158b7461dc71730f76c84ba4cf76490afe0c5323502341e97d7173a1607e9cc70e6a552cfb7491e485352c837d0aa2e6f9c46e81ef525bedc88e389ef
diff --git a/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild b/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild
new file mode 100644
index 000000000000..46857be2a72c
--- /dev/null
+++ b/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+COMMIT_ID="26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff"
+
+DESCRIPTION="vim plugin: "
+HOMEPAGE="https://github.com/nfnty/vim-nftables"
+SRC_URI="https://github.com/nfnty/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	# will install license file by default
+	rm LICENSE || die
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 228c3e99e63d..d561c0390e75 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
index f0d846f42bdc..62eb5b9f606f 100644
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild
index 07de51f32521..b450352957d4 100644
--- a/dev-cpp/catch/catch-2.9.1.ebuild
+++ b/dev-cpp/catch/catch-2.9.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 	S=${WORKDIR}/${MY_P}
 fi
diff --git a/dev-cpp/mm-common/mm-common-1.0.0.ebuild b/dev-cpp/mm-common/mm-common-1.0.0.ebuild
index 42b9cdc2119a..0cf682518884 100644
--- a/dev-cpp/mm-common/mm-common-1.0.0.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index ddd2e862bb86..63640cd1a9ff 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -3,3 +3,4 @@ DIST waylandpp-0.2.4.tar.gz 240718 BLAKE2B 4493f3e19dd546412f110227c44440a422d0e
 DIST waylandpp-0.2.5.tar.gz 177735 BLAKE2B 9add6147b7694d275f2f15f03476aef5bddebdca029f012743a0c0c388c7ef7394536b4401c78830487bb1c36a0b29ea348bc2acf60617af7bcbf917a5b691dd SHA512 a8c80282022b2ede3c3d0f5516e236aedaf3ef685565da8c61214fe37eda139bf152093eb29960be1889798eef5631b9d68a5e832c10cf1160c4a90f45eccb6e
 DIST waylandpp-0.2.6.tar.gz 178969 BLAKE2B aff9108691dfb2f27ac829865d3367a7f72de0a838b64f6265183a36a9ed5efbfcc9abcf724c784f5bda08c1a312cc7077fa55756b10520114dc8a23aa30f7a3 SHA512 b2d2f22864db830ec6a78282552a3e677f109c49381f21e80efec3cc65cad1820b1e10ad76d960e9d470f84060bb7f3edf0dcdd94025ae80a4a93ffcecfb8c5f
 DIST waylandpp-0.2.7.tar.gz 179121 BLAKE2B 6a8e77817962b8bd6ea93c059cd8cee9c655821bca0dc996b014d6085de1f88fe9a9f2b7c80a8b8fa405e898f7d96dc5d01f78288033d18184b5f0504c78c276 SHA512 67ec76d9bc0146472d70364c98b6b5af957c757a95d55c224ef2d9bf8b3ab15dc4f6333dca1ad803d94403be11abe7055db54d9fc708c6f5c0196f6a328a5ed2
+DIST waylandpp-0.2.8.tar.gz 181950 BLAKE2B 186515308d2e17e39e61f953fcf43df6bcff45a965d6425ffb71f0314fc091d241a975d0e7a61e988091ae7491cab56e163b6bccc0a2584b79b5bd5a7f8573fd SHA512 bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.8.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.8.ebuild
new file mode 100644
index 000000000000..6fda559666cb
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-0.2.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(ver_cut 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-libs/wayland-1.11.0
+	media-libs/mesa[wayland]
+	>=dev-libs/pugixml-1.9-r1
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index c08251395660..65799ec84ad8 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index f06e270fdc2c..219c37c6ae1c 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -12,7 +12,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild
index 8d4e32b0529e..ada13d31e8b9 100644
--- a/dev-db/mariadb/mariadb-10.1.45.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.45.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.2.32.ebuild b/dev-db/mariadb/mariadb-10.2.32.ebuild
index 333c32b43468..1b2e46a6c321 100644
--- a/dev-db/mariadb/mariadb-10.2.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.3.23.ebuild b/dev-db/mariadb/mariadb-10.3.23.ebuild
index 91ca29e6fb06..612ad9bf51ee 100644
--- a/dev-db/mariadb/mariadb-10.3.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.4.13.ebuild b/dev-db/mariadb/mariadb-10.4.13.ebuild
index b609ffd13bbd..69e74409ad54 100644
--- a/dev-db/mariadb/mariadb-10.4.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9c6bcbfc3482..1cd9d67e5eae 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 1c6c01a0571b..226424cf6171 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,2 +1,3 @@
 DIST nasm-2.14.02.tar.xz 827620 BLAKE2B deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4 SHA512 c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81
+DIST nasm-2.15.01.tar.xz 975376 BLAKE2B 86cd93c4b9c8f96e0d82d525f558e5240c2152c523d610078918eff176327736084718655cc97fb84cb762f21e6d0598b459243f22d76e006a8f0f58e02699ed SHA512 0eaac219d33243e0f35daea5222432226a27cb119e44e5c666773cd472fd032a1b1deb0b5eb950e5470ebf604ce7d31482d2dcb44ce5627465d006b7071a6153
 DIST nasm-2.15.tar.xz 975180 BLAKE2B 86fe345ddcc1817471e07fe17ba9009afa02fda152301e3d1cedff624cbd6ebb0e016a2fda339bd53f30fb3d60ae19f806d21c9dbe433ebb7d0e9a74d9db1576 SHA512 c88ff62d08aac86c4ce994bb83e80f1644e0433b01c40cebf183281d31bb4c79471f78e3beab6e7cafb28b3e92298aef89d75672444ea5e8d65c3b019e219583
diff --git a/dev-lang/nasm/nasm-2.15.01.ebuild b/dev-lang/nasm/nasm-2.15.01.ebuild
new file mode 100644
index 000000000000..1451280eeac2
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.15.01.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="https://www.nasm.us/"
+SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+# [fonts note] doc/psfonts.ph defines ordered list of font preference.
+# Currently 'media-fonts/source-pro' is most preferred and is able to
+# satisfy all 6 font flavours: tilt, chapter, head, etc.
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		app-text/ghostscript-gpl
+		dev-perl/Font-TTF
+		dev-perl/Sort-Versions
+		media-fonts/source-pro
+		virtual/perl-File-Spec
+	)
+"
+
+S=${WORKDIR}/${P/_}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
+)
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}
diff --git a/dev-lang/orc/orc-0.4.31.ebuild b/dev-lang/orc/orc-0.4.31.ebuild
index f382bd5a2b94..67a6b8e4c3f7 100644
--- a/dev-lang/orc/orc-0.4.31.ebuild
+++ b/dev-lang/orc/orc-0.4.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 3d3748eeb847..4ed63eca8857 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -2,6 +2,7 @@ DIST Python-2.7.17.tar.xz 12855568 BLAKE2B 6d09214a51d6595fe5253a279ee556d7510dc
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 DIST Python-3.6.10.tar.xz 17212220 BLAKE2B 822e231cf2755e6477e49e9128a983185a4f1e30e9d6c221f1b5720891c0de345e8c5402af458d3627eba124e75fea4b5daa94e01b0eaddc116dc3281263ecbe SHA512 26147099e1f1a0ffc85febad26e18e991f019599a150887ea0b925e34663fad8e03b3c2a941e2770c1a63960695e173ef32709572c9361e7f2cb862ccf75b28a
 DIST Python-3.7.7.tar.xz 17268888 BLAKE2B 5f16c9559249470a9e6c0aa686965e7d78ce0f7364b5d03fc9590613c7a5456f92835340e49bf9becbec18b18d1e5a6fc318b6e30f2349da3246a918cf8b05ff SHA512 ddc838a7b0c442c2e465616f20231f2b703ed6b69ed2dc17858aac8760814fdf7cff43d350d359300e47b6bb1f0bd38c31126b855e423a3a65ed06a8fa16d136
+DIST Python-3.7.8.tar.xz 17399552 BLAKE2B 4bf6c47b1132b6d31a79232002c4d38e2cd123ac05d52b21d6bfba5a4e19ec9130b8df8698d5ce6627e4297c4cf756643f036e694e36364c235306c72ef34bf8 SHA512 d2ba299e3cf8ed0f8fed9317f42bcd8d9af7e0e6175939b4be1be289c1658418bed17899e2608d762ffb15575021956cf6bf2054d7863c04b3bd7642f5b8c7ea
 DIST Python-3.8.2.tar.xz 17869888 BLAKE2B f42b35bea5e65f1f0a3fa6f1fd3d749fba3fa46d958608a314c1a98d0e3ca890e856da4d40ee489fe546fc02ce0fc9fa2daaaba96a8928d92ae7eb3d2dda3fe4 SHA512 ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
 DIST Python-3.8.3.tar.xz 17912964 BLAKE2B 9c415823f70bad97936e0472fc53a1b7650cbf0082da714266095dec74e0cd4a48c9477ad03fbb75fdc2cd8e41ef3aa5839e38fc69751720f5cb5c7fc77cce17 SHA512 3103bd8d944f3905eee3a2b52fd1f5c7dee380f9c5a99ad35a401fcba5a9117c3860ecec5cb47a92712c6549442fd2fa553a15c5657241dd09f5d00b9ed4f0f4
 DIST Python-3.9.0a6.tar.xz 18202376 BLAKE2B 32f04613a3b11341759eb98fd4b16edcb890a9ce19a4d5031aecdccd985a5462248fcd0e7bf478e2f23490ad85b36c760c14398f2b238e26038a476831f004d2 SHA512 edb71840347ab2b5e18b3a2b831a3d9a26e1af52de9b1c6c088ce2d20f8e96a22c87fc3677b62e49c91a00d8b531028bdc739f00fe220dbdeb343daf17829be4
@@ -14,6 +15,7 @@ DIST python-gentoo-patches-3.6.10-r1.tar.xz 15556 BLAKE2B 3d4755a083172fc878d345
 DIST python-gentoo-patches-3.6.10.tar.xz 10964 BLAKE2B e32c8cb3050c7324ee234f585be7fc40cfacc6ad87759eaa300e57289e6dc6cbaed3913f33ad632b8754638e8d71983d8364ceeaad8ef325cfa6d4d2dfb56df0 SHA512 71fea7306c876c63888c4547eaf14dc2e0413dec343609d748cd1b5888e4605d47888758ebc5120a287ce833b69dd538073f91989460da7c40462b53eefca7ce
 DIST python-gentoo-patches-3.7.6.tar.xz 10084 BLAKE2B 220869e85bdaf9c21b1b05e13803bdb6ecc22ac0f69da77e57fd7c1cd93ef45ec43401b62732842e1bb3467feb6d65c8204120e2741e9eb6f4cab673fd3a8d62 SHA512 4c04b0cf7da55fa7973ab178e3ac2c59bc2142924bdced5954c058053280b6c663d7c39912286d10fe0e82ca30af6a0dd6a56fa85433f836217ca3dcbb284def
 DIST python-gentoo-patches-3.7.7.tar.xz 14644 BLAKE2B 1a377eac945310082ec9fa257bcb406c7eaf24b5e80469dd49e82a1bc0554b75394678609cae447cb0fc7a19059b29166bf110b6ed99a89a9919b3a56a323f87 SHA512 2c7fbcefd6f4d1674b78f3b67f2be3f1b168e08c318fefe8d4757f2d30c22477f5010ad6f2c0abb265d819ee667617f21f93e002242e216b4ee570200b0ddf74
+DIST python-gentoo-patches-3.7.8.tar.xz 10304 BLAKE2B dc1bff35bdf3f7e97d15fbd0af4c3278ea54b43cb204641f666293dec507431987445fe6ecb991814842b8c58c65a6185b4c24e3ae08d682ef98916263af7cd4 SHA512 5871121e514dd6af4d9298550a5e01ee114950fd6db58bb8bdb879ede602a228f64d7bf8f6e04317ababc42a502b1192f4a010122745d5a8bc7a40866106479a
 DIST python-gentoo-patches-3.8.1-r2.tar.xz 10108 BLAKE2B 02d3e2ae95b5cfa67c0ba4ff618fbee51d2342955d0a064b80575beda73902bd72462e4f6dba63743bf9fc031d92c69153ef8bd8a0ab5d6e17bfdf8ed0152da5 SHA512 757f7cf6b0cb6c1493d8ed8e5780780efcb32860a9aeba4f933a3a3fb22c412bebde8854e34609465d8a12cb9545a7b19e5d5dbe87d772bb83acd9fe829b75cc
 DIST python-gentoo-patches-3.8.2-r1.tar.xz 16112 BLAKE2B 9ae197a56bbd96afa11c4312c68ac030138773df22dedc3a3e6fb9e81b366d6522fb2c147946eb604a87d749cbea7e5e5eed8ae0e737294c0949a8c2791dd327 SHA512 00f31c3b7227dd443f05234fbb7744338ce687e1ea4d236a6b1d386d76082acb34259f59442018c9ace54e0004dea9ac822ae2a4470159b83d00112e258baff0
 DIST python-gentoo-patches-3.8.3.tar.xz 10704 BLAKE2B 6fdd13139b1132313153af2de774abeca7c1fe9acb34a87e5d96875a4cbe8c22c201acbb11c15eeaf828493c32f6acd89e3b5d4012fa2c9d216da556aadb9f01 SHA512 6f67d77e8240983c0dd749620e5df81df5816b831032e190c82c8d73ea8a995daf2631640234a1350e483bd13276466457d110176612bfde3281d1b6a8bf97bb
diff --git a/dev-lang/python/python-3.7.8.ebuild b/dev-lang/python/python-3.7.8.ebuild
new file mode 100644
index 000000000000..c88e819e8b18
--- /dev/null
+++ b/dev-lang/python/python-3.7.8.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-3.7.8"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}/${PYVER}m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+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? (
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${scriptdir}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
+	then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/vala/vala-0.40.23.ebuild b/dev-lang/vala/vala-0.40.23.ebuild
index a68691cfb8a5..fa0827d6f754 100644
--- a/dev-lang/vala/vala-0.40.23.ebuild
+++ b/dev-lang/vala/vala-0.40.23.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.46.10.ebuild b/dev-lang/vala/vala-0.46.10.ebuild
index b2cf09e6053f..1679dc70e431 100644
--- a/dev-lang/vala/vala-0.46.10.ebuild
+++ b/dev-lang/vala/vala-0.46.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.46"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.48.6.ebuild b/dev-lang/vala/vala-0.48.6.ebuild
index 15356e7b1f79..e8e41c666523 100644
--- a/dev-lang/vala/vala-0.48.6.ebuild
+++ b/dev-lang/vala/vala-0.48.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.48"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a8ce12009d0c..599b4a6c6747 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
index 8d2dc97256c5..0ecb78c0317f 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index bb9a74993b78..957e5d88bca4 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit out-of-source
+inherit autotools out-of-source
 
 DESCRIPTION="Library for MS CHM (compressed html) file format"
 HOMEPAGE="http://www.jedrea.com/chmlib/"
@@ -19,13 +19,21 @@ PATCHES=(
 	"${FILESDIR}"/${P}-headers.patch
 )
 
+src_prepare() {
+	default
+	# Required for CONFIG_SHELL != bash (bug #668408)
+	eautoreconf
+}
+
 my_src_configure() {
-	econf \
-		$(use_enable examples) \
+	local myeconfargs=(
+		$(use_enable examples)
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 my_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest
index 1ef0535c56e2..53dbe0deb0a1 100644
--- a/dev-libs/freexl/Manifest
+++ b/dev-libs/freexl/Manifest
@@ -1,2 +1,3 @@
 DIST freexl-1.0.1.tar.gz 933371 BLAKE2B ef89bc6779379ee7d8b7251faf1d965001aeaf3d9d1c69c27f4cc0c6c8c2af5e37c9291163c6f1dfee44fade0cec5db105f2f0fe45dd1804ee3a584c7f83f9d8 SHA512 a945d642a7ae9bc7c9dfc48a5bfd61da71290558bbcc73124bc09f08e8eae3bc96ab5e478a5b5205a897ad5d7783269a8232992d5068121436013c51524801c5
 DIST freexl-1.0.2.tar.gz 939064 BLAKE2B 7c1e4f089dfa499aa8966d6e8ddf1a534a8542e1a1f2108d3b13c75e809a3f710bc45a9b01b0eb584dfeba98aa0f416d99a14261c054811208ab46ec415e51f4 SHA512 554ad06905cbac3f88694e798369c1e1c4c64709eb4086b80eb3370dfd3bdc31d1b58441bcbf40b72700f177606ae900f2ab48ead873ac331c82edd718318354
+DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b
diff --git a/dev-libs/freexl/freexl-1.0.1.ebuild b/dev-libs/freexl/freexl-1.0.1.ebuild
index c8233e266cd9..89805bc14856 100644
--- a/dev-libs/freexl/freexl-1.0.1.ebuild
+++ b/dev-libs/freexl/freexl-1.0.1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils ltprune
 
 DESCRIPTION="Simple XLS data extraction library"
-HOMEPAGE="http://www.gaia-gis.it/gaia-sins/"
-SRC_URI="http://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index"
+SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
diff --git a/dev-libs/freexl/freexl-1.0.2.ebuild b/dev-libs/freexl/freexl-1.0.2.ebuild
index c529936d80c3..bb3b445b6e9f 100644
--- a/dev-libs/freexl/freexl-1.0.2.ebuild
+++ b/dev-libs/freexl/freexl-1.0.2.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils ltprune
 
 DESCRIPTION="Simple XLS data extraction library"
-HOMEPAGE="http://www.gaia-gis.it/gaia-sins/"
-SRC_URI="http://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index"
+SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
diff --git a/dev-libs/freexl/freexl-1.0.5.ebuild b/dev-libs/freexl/freexl-1.0.5.ebuild
new file mode 100644
index 000000000000..585d307da266
--- /dev/null
+++ b/dev-libs/freexl/freexl-1.0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple XLS data extraction library"
+HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index"
+SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/gjs/gjs-1.58.8.ebuild b/dev-libs/gjs/gjs-1.58.8.ebuild
index f03433ba7e3d..ff08567af5e2 100644
--- a/dev-libs/gjs/gjs-1.58.8.ebuild
+++ b/dev-libs/gjs/gjs-1.58.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58.0
diff --git a/dev-libs/libgusb/libgusb-0.3.4.ebuild b/dev-libs/libgusb/libgusb-0.3.4.ebuild
index bbf96feb85b6..7b23026baa05 100644
--- a/dev-libs/libgusb/libgusb-0.3.4.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index a30aeea3c8dd..34cc064bc436 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,2 +1 @@
-DIST libjcat-0.1.2.tar.gz 62630 BLAKE2B cb333098d984f840a80c4ea4b7feab32ca7d04882f2f4aa788c01dd13c616b85576af5bbcd0ca343a7f5b7221ab69b202c7a8cacb230eeeefab9a3a9a61d7d3f SHA512 9184b761cad5a43ac1f0b0cd4ff54c372ec067785c9b796d813aab6a936fbb522f419e965b70d4d71fbec9f7c25f9d185f957cf1e73cb0e5bdeca9492e11b0fd
 DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69
diff --git a/dev-libs/libjcat/libjcat-0.1.2.ebuild b/dev-libs/libjcat/libjcat-0.1.2.ebuild
deleted file mode 100644
index 32fec2f11c2a..000000000000
--- a/dev-libs/libjcat/libjcat-0.1.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit meson python-any-r1 vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files "
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib:=
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	introspection? ( dev-libs/gobject-introspection:= )
-	pkcs7? ( net-libs/gnutls )
-	dev-lang/vala:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	gtk-doc? ( dev-util/gtk-doc )
-	man? ( sys-apps/help2man )
-	test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
-)
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	xdg_environment_reset
-# TODO: make vala optional
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use gpg)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use pkcs7)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libmanette/libmanette-0.2.4.ebuild b/dev-libs/libmanette/libmanette-0.2.4.ebuild
index d29401506c58..75a84e42c7a8 100644
--- a/dev-libs/libmanette/libmanette-0.2.4.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libressl/libressl-3.1.3.ebuild b/dev-libs/libressl/libressl-3.1.3.ebuild
index 1df45e25a730..abb7086fb0d5 100644
--- a/dev-libs/libressl/libressl-3.1.3.ebuild
+++ b/dev-libs/libressl/libressl-3.1.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either. However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
index b0f3976e72c2..5cdeef64138e 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 809bdb00ebb5..b1158e7ca13d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,6 +1,5 @@
-DIST nss-3.51.1.tar.gz 78310874 BLAKE2B c295b5fdf6e1d24cc79474f2c5a9e91fccf777212fbb072e8a64576ed1b060fea6ecbde1fa59bb07c998b9aa92bb7d450e722a8f34a72eaa35aef6cbd693420a SHA512 1878780886cc330489a14a60ee5cb67b174f3167d020db256eacdce079652ef8af65813914cd0fb5684457053fa27acc9bff72d0713fbea28795613ca45a6d46
 DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0053828b140b2b927ddab8c8881b23c7d4c003f3e2d0dcd22efbe699baee63443cab6e72d33a552fd430e3c SHA512 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
 DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6
-DIST nss-3.52.tar.gz 81220587 BLAKE2B 0208c9047c61233ed36f02d57fdc64fa1734ef69d17fa499707f4a3b14a2e880b1dcf4b19b17a38e9b41d2e46b4a9488613d82989be747ad82aebc35b8e491af SHA512 a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6
 DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e SHA512 5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0
+DIST nss-3.54.tar.gz 81190188 BLAKE2B bf91aa3e2081f0d123d3adfbfc2e3cadfeccf6b15ce03f429fede73bd57ebf96ba7317b890762b01820d75020bb99383c022e2e6558aa1a6d44e8c92cd533bd2 SHA512 9b9253469514c085730ae580f6544e882a8264e253687950627a4fa1eeb956287c9da46caf7d8988cd6363f6dee26cb8db755203375751fe53795697d7ae9b7b
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
index be2d4802c4c2..962b9cb1eedb 100644
--- a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
+++ b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
@@ -1,9 +1,9 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1642174
 
-From 9e4f30b3168a95243df0c0891e3e432bc95382ad Mon Sep 17 00:00:00 2001
+From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001
 From: Lauri Kasanen <cand@gmx.com>
 Date: Mon, 1 Jun 2020 12:11:45 +0300
-Subject: [PATCH v2] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
+Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
  ABI version 2 is not compatible with ABI version 1 output
 
 Don't try to build the SHA-2 accelerated asm on old-ABI ppc.
@@ -17,7 +17,7 @@ Signed-off-by: Lauri Kasanen <cand@gmx.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
-index 5f7384429..d01587c7a 100644
+index 5f7384429..e0461c7d3 100644
 --- a/lib/freebl/Makefile
 +++ b/lib/freebl/Makefile
 @@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
@@ -25,9 +25,9 @@ index 5f7384429..d01587c7a 100644
  ifeq ($(CPU_ARCH),ppc)
      EXTRA_SRCS += gcm-ppc.c
 -    ASFILES += sha512-p8.s
-+    PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | grep _CALL_ELF | awk '{ print $3 }')
  ifdef USE_64
      DEFINES += -DNSS_NO_INIT_SUPPORT
++    PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
 +    ifeq ($(PPC_ABI),2)
 +        ASFILES += sha512-p8.s
 +    endif
diff --git a/dev-libs/nss/nss-3.52.1-r1.ebuild b/dev-libs/nss/nss-3.52.1-r1.ebuild
index 56359ce59559..ac5506ab5973 100644
--- a/dev-libs/nss/nss-3.52.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.52.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert utils"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
diff --git a/dev-libs/nss/nss-3.52.ebuild b/dev-libs/nss/nss-3.52.ebuild
deleted file mode 100644
index 2c01890c4d30..000000000000
--- a/dev-libs/nss/nss-3.52.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.25"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.51.1-r1.ebuild b/dev-libs/nss/nss-3.54.ebuild
similarity index 97%
rename from dev-libs/nss/nss-3.51.1-r1.ebuild
rename to dev-libs/nss/nss-3.54.ebuild
index 2c01890c4d30..d94d193dbe96 100644
--- a/dev-libs/nss/nss-3.51.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.54.ebuild
@@ -36,9 +36,10 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
 )
 
 src_prepare() {
@@ -149,24 +150,16 @@ multilib_src_compile() {
 	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
 	unset NSPR_INCLUDE_DIR
 
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
 	export NSS_ALLOW_SSLKEYLOGFILE=1
 	export NSS_ENABLE_WERROR=0 #567158
 	export BUILD_OPT=1
 	export NSS_USE_SYSTEM_SQLITE=1
 	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
 	export FREEBL_NO_DEPEND=1
 	export FREEBL_LOWHASH=1
 	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
 	export ASFLAGS=""
 
 	local d
diff --git a/dev-libs/stfl/stfl-0.24-r2.ebuild b/dev-libs/stfl/stfl-0.24-r2.ebuild
index 97e5592ed6e7..6d453e897e72 100644
--- a/dev-libs/stfl/stfl-0.24-r2.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="examples perl python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-1.3.40 )
 	ruby? ( dev-lang/swig )
 "
+RESTRICT="test"  # Upstream does not provide tests #730112
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.21-python.patch"
diff --git a/dev-libs/stfl/stfl-0.24.ebuild b/dev-libs/stfl/stfl-0.24.ebuild
index bdce7f3941f3..063edf019c58 100644
--- a/dev-libs/stfl/stfl-0.24.ebuild
+++ b/dev-libs/stfl/stfl-0.24.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-1.3.40 )
 	ruby? ( dev-lang/swig )
 "
+RESTRICT="test"  # Upstream does not provide tests #730112
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.21-python.patch"
diff --git a/dev-libs/vala-common/vala-common-0.48.6.ebuild b/dev-libs/vala-common/vala-common-0.48.6.ebuild
index 4d6b87b913c1..3d68342f2952 100644
--- a/dev-libs/vala-common/vala-common-0.48.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index e2a202697e78..37213f21e10b 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index dd49441bc78c..674b5f2e930a 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..7cff2bc42841
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild b/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
index 00d512d734a3..e4cf9c5ceacb 100644
--- a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
+++ b/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use Moose or Mouse modules (DEPRECATED)"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 ~arm hppa ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 PERL_RM_FILES=(
diff --git a/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r2.ebuild b/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r2.ebuild
new file mode 100644
index 000000000000..f659a54cd1e5
--- /dev/null
+++ b/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BTROTT
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Read/write encrypted ASN.1 PEM files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+RDEPEND="
+	dev-perl/Class-ErrorHandler
+	>=dev-perl/Convert-ASN1-0.100.0
+	dev-perl/Crypt-DES_EDE3
+	virtual/perl-Digest-MD5
+	virtual/perl-MIME-Base64
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
+"
+PATCHES=(
+	"${FILESDIR}/${P}-526.patch"
+	"${FILESDIR}/${P}-decryptiontest.patch"
+	"${FILESDIR}/${P}-testbuilder.patch"
+)
diff --git a/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r3.ebuild b/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r3.ebuild
new file mode 100644
index 000000000000..a09dd8150bfb
--- /dev/null
+++ b/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DOUGW
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="A Perl module for reading TNEF files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/MIME-tools-4.109.0
+	dev-perl/IO-stringy
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.110.0.ebuild b/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.110.0.ebuild
new file mode 100644
index 000000000000..1fbe05d444dd
--- /dev/null
+++ b/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.110.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=KAZEBURO
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Accelerate Cookie::Baker's crush_cookie"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+	)
+"
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Cookie-Baker-XS/Manifest b/dev-perl/Cookie-Baker-XS/Manifest
index 6c181b5a3e87..46c849d364cf 100644
--- a/dev-perl/Cookie-Baker-XS/Manifest
+++ b/dev-perl/Cookie-Baker-XS/Manifest
@@ -1 +1,2 @@
 DIST Cookie-Baker-XS-0.08.tar.gz 56729 BLAKE2B 040688d8b0d519a40833cb99b0601e1b591f7db33c63673f0acebea8c2228fb3e2b5f2cb32a7dbd2e793a61203af3a232c67f7df6d0acf99664b183fe4c4d7ad SHA512 ac51a13f0cedb329b15abefd4f4eefd6f40729f0dcc0458154ddba30fff53e9b5ae994a8d6051c1da2105c0901480c22ae99845d46a7fc5ba980cc447f98ee34
+DIST Cookie-Baker-XS-0.11.tar.gz 56814 BLAKE2B a62fafe4c5ec0a789865737440c08769b66fd5de637806ffee6f39be3810db21ab141c37709f416e1a3e140b931d05df8296236ecbaa7b676d6481a83319f3d8 SHA512 01c75cb2bd9163cc2e27bf5343a9bc7c596158ca57f93437307ee3a0d991ecc5c1c24e26c3e2a1116e5685fc5b6aacf17d09f22bba99919acd3df55964be762f
diff --git a/dev-perl/Cookie-Baker/Cookie-Baker-0.110.0.ebuild b/dev-perl/Cookie-Baker/Cookie-Baker-0.110.0.ebuild
new file mode 100644
index 000000000000..a5fa623a6242
--- /dev/null
+++ b/dev-perl/Cookie-Baker/Cookie-Baker-0.110.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=KAZEBURO
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Cookie string generator / parser"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test +xs"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Exporter
+	dev-perl/URI
+	xs? ( >=dev-perl/Cookie-Baker-XS-0.110.0 )
+"
+DEPEND="
+	dev-perl/Module-Build-Tiny
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+		dev-perl/Test-Time
+	)
+"
diff --git a/dev-perl/Cookie-Baker/Manifest b/dev-perl/Cookie-Baker/Manifest
index 04cc409e01f0..f2701a7580c1 100644
--- a/dev-perl/Cookie-Baker/Manifest
+++ b/dev-perl/Cookie-Baker/Manifest
@@ -1 +1,2 @@
 DIST Cookie-Baker-0.08.tar.gz 11981 BLAKE2B 47f15e9f5333c4e5ece274dec44f54275bed02570a253cb46903495961f2c68f3cd77fcf73747e7e17e8649fe75439ec08ea1cbfaca7a0d03bbeea07b292af0a SHA512 5beeac6ff3a2d2ae73d5efd49490af240c2580201a87e739882f3c7d8fc20ee77c225349d130752b52ddbabf7bd173015d8d5cedb609c30a748e3d9e41efda51
+DIST Cookie-Baker-0.11.tar.gz 12496 BLAKE2B 906a1edb558edfe4da6b42a6ec82fc2635d355b90f784d5e7c3e2783691afc21e20ab2129bb231b2607e3fb8a0650436a328b7851aaa07dca3dd0036f9d2dfcf SHA512 0b75d9c74e1daa5d4dd63febd887e6c4825fd1df5f56335bf733b5bf2f24a56f6b76728259799aaf4dedf27efae90c238962585956608b1408a67164c3759ed2
diff --git a/dev-perl/Coro/Coro-6.514.0-r1.ebuild b/dev-perl/Coro/Coro-6.514.0-r1.ebuild
new file mode 100644
index 000000000000..83c430d2bd92
--- /dev/null
+++ b/dev-perl/Coro/Coro-6.514.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=6.514
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="The only real threads in perl"
+LICENSE="|| ( Artistic GPL-1+ ) LGPL-2.1+ || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ev event"
+
+RDEPEND="
+	>=dev-perl/AnyEvent-5
+	ev? ( >=dev-perl/EV-4.0.0 )
+	event? ( >=dev-perl/Event-0.890.0 )
+	>=dev-perl/Guard-0.500.0
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Storable-2.150.0
+	dev-perl/common-sense
+"
+DEPEND="${RDEPEND}
+	dev-perl/Canary-Stability
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+PATCHES=(
+	"${FILESDIR}/${PV}-ev-config.patch"
+)
+src_configure() {
+	local myopts=()
+	use ev && myopts+=("EV")
+	use event && myopts+=( "Event" )
+	GENTOO_OPTS="${myopts[@]}" perl-module_src_configure
+}
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild
new file mode 100644
index 000000000000..63619498e387
--- /dev/null
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=4.19
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/perl-Math-BigInt-1.160.0
+	virtual/perl-Carp
+	>=virtual/perl-Encode-1.980.100
+	virtual/perl-XSLoader
+	>=virtual/perl-podlators-2.80.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Test
+		virtual/perl-Test-Simple
+		virtual/perl-Time-Piece
+	)
+"
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
+src_test() {
+	ewarn "Comprehensive testing may require manual installation of dependencies"
+	ewarn " See: https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Tests"
+	perl-module_src_test
+}
+pkg_postinst() {
+	ewarn "This package provides 'cpanel_json_xs' in PATH, which includes optional features"
+	ewarn "otherwise not automatically made available yet. If you desire to use these,"
+	ewarn "please consult:"
+	ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Optional_Features"
+}
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index 2f8a6222e75e..fb2be6c27d73 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -1 +1,2 @@
 DIST Cpanel-JSON-XS-3.0239.tar.gz 219371 BLAKE2B b03ad479cc1171d0aba84f0ba221caca14a0ac560712400632d90505e4fb74c50927cd9ad6453e91687e0b4c4f1fd2b50fa32d6355c7d46518bd63adda82734c SHA512 fee7b52f2bb48a4dc6314da4c274bb3456b6af2a0d891c1125425e5a0898e3115ea486a7dc057c25aaf7fc141bfebb5ea4341b17d00373b68a7388eb75f5bdb0
+DIST Cpanel-JSON-XS-4.19.tar.gz 251461 BLAKE2B fa22192d017fc41327e71b84f47e3939765b0c48586cc31876f744c2a51a93b36f6d41b8c9f92bba04875123604efe3fed6a486839dbfb39623cb2a4a4064087 SHA512 c67b62e8f95900cb3626357cfa9976f1553f84ffd10a977d47839ca3b317014473c3a6e48f6680478b89bbdc2ac177b22441ad5e49e7e8eb0344ef14a3c52b10
diff --git a/dev-perl/Cpanel-JSON-XS/metadata.xml b/dev-perl/Cpanel-JSON-XS/metadata.xml
index 67f963023f80..a3c4623686b0 100644
--- a/dev-perl/Cpanel-JSON-XS/metadata.xml
+++ b/dev-perl/Cpanel-JSON-XS/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="cpan">Cpanel-JSON-XS</remote-id>
     <remote-id type="cpan-module">Cpanel::JSON::XS</remote-id>
+    <remote-id type="cpan-module">Cpanel::JSON::XS::Type</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild b/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild
new file mode 100644
index 000000000000..abdc8041bf6b
--- /dev/null
+++ b/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DPARIS
+DIST_VERSION=2.14
+inherit perl-module
+
+DESCRIPTION="Perl Blowfish encryption module"
+
+LICENSE="Crypt-IDEA"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Crypt-CBC
+	)
+"
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild b/dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild
new file mode 100644
index 000000000000..c56e23d5161f
--- /dev/null
+++ b/dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BOBMATH
+DIST_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="CAST5 block cipher in pure Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=virtual/perl-Test-Simple-0.480.0
+		dev-perl/Test-Taint
+	)
+"
diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r2.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r2.ebuild
new file mode 100644
index 000000000000..9f060a76d788
--- /dev/null
+++ b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LDS
+DIST_VERSION=2.33
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/perl-Digest-MD5-2.0.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Crypt-Blowfish
+		dev-perl/Crypt-DES
+		dev-perl/Crypt-IDEA
+		dev-perl/Crypt-Rijndael
+	)
+"
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
index 7a5aa337f6b8..9124f2a50a6b 100644
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Temporary changing working directory (chdir)"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 # Cwd -> perl-File-Spec
diff --git a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
index 21a9a4785e29..cafe7214afcb 100644
--- a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
+++ b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check the compiler's availability"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
index 3a3a05b5fb93..0cb7ae1a2171 100644
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
+++ b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for replacing a link by a copy of the linked file"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index fcaca1195e19..2e2280b6255f 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
index e589a7d2bc23..cd07328a2094 100644
--- a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
+++ b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Module::Build class for building XS modules"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 # File::Basename -> perl
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
index df5be6097bd0..87d70632883f 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Organise your Moose types in libraries"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mouse/Mouse-2.4.10.ebuild b/dev-perl/Mouse/Mouse-2.4.10.ebuild
index bdfb555d046d..723415a04acb 100644
--- a/dev-perl/Mouse/Mouse-2.4.10.ebuild
+++ b/dev-perl/Mouse/Mouse-2.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Moose minus the antlers"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
index 2c034caf3962..667f0f544edb 100644
--- a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
+++ b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Extend your attribute interfaces for Mouse"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
index a627b4d61bad..1a8b0a6a72b3 100644
--- a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
+++ b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Helper routines for using Sub::Exporter to build methods"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
index 03dc3f8b23f1..139e7903be78 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module virtualx
 
 DESCRIPTION="Perl bindings for libxcb"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild b/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
index 350333bc5785..59cc609bf7a2 100644
--- a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
+++ b/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Recursive decent XML parsing"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild b/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
index 3a6052c3da44..1a01e6e59969 100644
--- a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
+++ b/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Simplified interface to XML::Parser"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
index b916035b6247..4a37960786e5 100644
--- a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
+++ b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Opaque, extensible XS pointer backed objects using sv_magic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/local-lib/local-lib-2.0.24.ebuild b/dev-perl/local-lib/local-lib-2.0.24.ebuild
index 5f4dfab2c96d..2a37814b9b45 100644
--- a/dev-perl/local-lib/local-lib-2.0.24.ebuild
+++ b/dev-perl/local-lib/local-lib-2.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index e11cbc06eb54..7abf80f560bd 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index 38bd7db48221..7c879eb4575c 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -3,3 +3,4 @@ DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d942522
 DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518
 DIST Mail_Mime-1.10.7.tgz 38445 BLAKE2B 4e990a9a704aa8fd918dcbcd271946cd5a76c55783cfa207a9a8d171c1e0d407e19e2a30ce46689c8afddeee0037082d77ecbc0e3fb0b4e94f82a2b242ef22c6 SHA512 b3ac0076d3519c14f0331b73940a4fa47cfeb1d2c31d5a5ffa820042fc9b56a8b4d479f349dbe213164c157d5c56caaf0b4f70ef422cc3eba40443433c813d60
 DIST Mail_Mime-1.10.8.tgz 38783 BLAKE2B 5a9410dd0778bbd765a6c6f2e7880d2e7951d131c3e2195a840e0b31579fc2c8b722db434d3d104fa3d178e7033cb08d9ac15a9ebfa38911566d5e52a2ddbae8 SHA512 3f32b894ded49fc848650d684d98c9db6394074491a0ef92ed97be01f35ad01aab96845d4bc590034767fcc92631fdf475db3d0c926a000ad7879d6a9ac824b5
+DIST Mail_Mime-1.10.9.tgz 38928 BLAKE2B aa55b61b6b683db8a8ec26c896f38b5c62376a39488dbfb5d56bca3b199086d3057533072fe2070859f12052207fde1f0bcad86b97830e66fef95f5b69381fb7 SHA512 aefaf0501c3876750b567a4d4c4edfb629b51f2a2bcf104705cf938611334bfb587a0cac270eed52c111819dd018199a3907916060b9b9fdbddf5ba143d71061
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild
new file mode 100644
index 000000000000..a88d469a1fcd
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit php-pear-r2
+
+DESCRIPTION="Create and manipulate mime messages with PHP"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index e337601d0c3f..7fd8f8cb8361 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -2,4 +2,5 @@ DIST composer-1.10.1.tar.gz 421852 BLAKE2B a40f59ab0af5eba777f1926bab78e55fd1973
 DIST composer-1.10.5.tar.gz 423065 BLAKE2B 0c8595f3583a692f89294455984aeff2ad9cbf2a39541355cbb736e717baacae8245fa81e6b9fde11dd5bb56ad3a074262f6f8ecb65b4bef9c782ef39887deec SHA512 cdadb2d146afcc140316b83d3b4f4c018d79e8222f6a6207cdd52db75ae9c78e787a509d88a3fe113f8218df2ace56ba2dd043e1b6e6c3dbb5129fd51d8e9925
 DIST composer-1.10.6.tar.gz 423789 BLAKE2B 74d93e769c660f2c74e0ad5dd3ed5e5279c217552eb6d342ffd43d7fba10647865ade7b284c811f63504e0335e5655eae681cf14ae4d876eb56ff6a306c61268 SHA512 fdc209a82d3adda2728190282327b02d2b71bb9b1a80cbcda3699a826ee56451c997edac13d76e2784ebd4297d413bd46dd47b9538accd4bfe6c569464696779
 DIST composer-1.10.7.tar.gz 424264 BLAKE2B 9939e4d1f29071ca4467076c13e0ceab32d10282876ebb0a76f41dd3efbd9c40a50dbf278dd0a12b2119d40ff9424c171f07381fbaadb94218b1fdf69f403fdb SHA512 81ece3314cddced101b0be491e40b60d42ef503cef4b1d5598c32f3378f10524004a7a8ef4360453a4cdaaf9d3b986ce07696de075dc424deae7703945f6d577
+DIST composer-1.10.8.tar.gz 424875 BLAKE2B 5ce0e9f6b2345900640808df5233a8dbc959ba7421eda038d939e426ea5af67c236acad21d15c392bfc413187ea2611d3c587bd6f25b4e7de503b4832e4da54a SHA512 a891dca203667a63b722cd0fa8c05dfe12b07b17addad7ee94ae1db0d0887ce5fccf35985fb8fa3af5f98d2bb8df9cb2e4b9ce386c07617cf8a413b21621983d
 DIST composer-1.9.3.tar.gz 412212 BLAKE2B fc293a38baaf87cc2581304e1438d48e94a85ca2c5da4eff388b1307dadacb67327d9612211af70f1734872c7a377b8713492839c2d330c9e0e7226206cdc1f6 SHA512 42a37b2187895e06f2dc8c5225a1328377afc408ad28af12d9ef5d15fe083dcf22459ce0f482abfd528683113af5f9fd1a19758294c59c69b59a5bb32e65f2cc
diff --git a/dev-php/composer/composer-1.10.8.ebuild b/dev-php/composer/composer-1.10.8.ebuild
new file mode 100644
index 000000000000..29915836e3cf
--- /dev/null
+++ b/dev-php/composer/composer-1.10.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6fc75896b41c..94ce0828afa4 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
index 0785fecc4cf2..0124db04df17 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 # Unit tests are temporarily disabled for this version, see below for
 # what needs to be done.
 #IUSE="test"
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
index 1156d983160d..0cdaca1585c5 100644
--- a/dev-python/cherrypy/cherrypy-18.5.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="ssl test"
 
 RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 5339aef9511b..59d2537eefa2 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,5 @@
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-10.0.0.ebuild
index 789c9ee28d9b..55385ff45617 100644
--- a/dev-python/clang-python/clang-python-10.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..6d7cb294e651
--- /dev/null
+++ b/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
index 60543908ceab..5b85d6f488d8 100644
--- a/dev-python/django/django-2.2.13.ebuild
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index 34902abc4db6..f0bc9e15d221 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 35e7247e99a7..72a6f7164ec9 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index 937044b5f9fc..680c710ccb08 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index cb0e63963d26..21d365d3af3d 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 5690e9e1e5bf..9a3c00ccc7dd 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index dd49441bc78c..674b5f2e930a 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
index 4f631b669e75..55b531a08716 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-10.0.1_rc2.ebuild b/dev-python/lit/lit-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..b9123ef7bf14
--- /dev/null
+++ b/dev-python/lit/lit-10.0.1_rc2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
index 36cd1d8f6be6..203da895b9af 100644
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo excel gtk3 latex qt5 test tk wxwidgets"
 REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
index 91b2099a971d..eb1517ece9d8 100644
--- a/dev-python/matplotlib/matplotlib-3.1.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
 REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )"
 # tests are fixed in 3.2.1, this version is beyond repair
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
index 2da49ac2e914..efaf55db2516 100644
--- a/dev-python/misaka/Manifest
+++ b/dev-python/misaka/Manifest
@@ -1 +1 @@
-DIST misaka-1.0.2.tar.gz 78702 BLAKE2B a07be5c94098e716d1494c69d84c50f8a78fe3b3a1a21d9a2ecce1c7474de9e493775b50f18cbdfa7c2bfb914fc4229d281282a80523e794de846d0f947238f1 SHA512 ba3ef2e4c66e0e33e21bb554c3e317342929b3d9969aaba7e3dbd745430b3952b6bb7d3142a3049c4de3e3dede7cc68a9810cd43642e014949e4564fcb2cc74d
+DIST misaka-2.1.1.tar.gz 125187 BLAKE2B c739ac13430425fbfef56ff56b8b93a2be8654779793f233dd7be508a462114cef1d4977881646e2a0717adb4a10eac924edcc6e017658a703019c5a0b039b8e SHA512 345cbce4d3b4b7e99e13e32fe4049c6cc27b576685d9d44771a41c486b4fcd8696bd094ab426750ad1841a6d4d1edeee6a60def11559ccf1e3854f2e1bda51d1
diff --git a/dev-python/misaka/metadata.xml b/dev-python/misaka/metadata.xml
index 028f277d07aa..8e2bffc1919e 100644
--- a/dev-python/misaka/metadata.xml
+++ b/dev-python/misaka/metadata.xml
@@ -6,6 +6,7 @@
     <name>Openstack</name>
   </maintainer>
   <upstream>
+    <remote-id type="github">FSX/misaka</remote-id>
     <remote-id type="pypi">misaka</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/misaka/misaka-1.0.2.ebuild b/dev-python/misaka/misaka-1.0.2.ebuild
deleted file mode 100644
index 0d286e7345db..000000000000
--- a/dev-python/misaka/misaka-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Python binding for Sundown, a markdown parsing library"
-HOMEPAGE="https://misaka.61924.nl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/misaka/misaka-2.1.1.ebuild b/dev-python/misaka/misaka-2.1.1.ebuild
new file mode 100644
index 000000000000..f1a7a807f3cc
--- /dev/null
+++ b/dev-python/misaka/misaka-2.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CFFI binding for Hoedown, a markdown parsing library"
+HOMEPAGE="http://misaka.61924.nl/ https://github.com/FSX/misaka"
+SRC_URI="https://github.com/FSX/misaka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/cffi[${PYTHON_USEDEP}]"
+
+# FIXME: tests requires write access outside sandbox
+#distutils_enable_tests setup.py
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index 3c4bbdb00f8c..9d9fca972a5f 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
index fbc6d6a64740..2f72469ccad5 100644
--- a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 RDEPEND="
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
index 816375eebd1c..4e98df61a1ba 100644
--- a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index 7b9808fa2730..8875cb0a0719 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
index 68cf55980855..bc13434facee 100644
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 28b3a53c9ad6..250d86e8b5ef 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -4,3 +4,4 @@ DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577f
 DIST tqdm-4.45.0.tar.gz 140990 BLAKE2B 8699b3a820859406e9bbafaaa48ba1b418e3083898d2b6c3401078996dd03431db259d5ad8a377226a50b80513ef0fc55bdaf2b67fc4a2bdd490bc5fdc04d681 SHA512 7b35f86205c6581ede9bdb0788e7f55be525c3f0f77952803046661c6a7a6cd3c15ed0323376ecedb5cddace1b32a41fee1932033dcaa49f9096dc3b9b674f10
 DIST tqdm-4.46.0.tar.gz 144312 BLAKE2B 93b902d9a362e658f244f3c1b15a3496425cb3e401adf291dc0a9c7c0bd551baa1171a753be8d1c3b877d2cd3ab25e81dddbd8492668d0b0f6ca3cb47d13be1c SHA512 ccdfce4d273e78ced172fc3edb24ac038465169f7b765e7bf779831ef3d0dc72c648c5fb165aba02e0c6dc86c5d0ea3d93d5530b642ddd84e3d284c7354739cf
 DIST tqdm-4.46.1.tar.gz 144383 BLAKE2B 4d72bfbf0c225c779ae2c9bf405f9effdb69cfe7862325b12e8408c17a03b7a87f9cf0d055de598a67132861114c89b237d0ad2509302e452cc67ce9aa34fa48 SHA512 de8710ceb44b6caa073aaa3c9dca281880d752d1b542a3dd87a54884478a185c35ab1969c6cb7242e30ee0511f967cde7bd4fa83a8d4f8c58d3e95ad2bf3bfc6
+DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
diff --git a/dev-python/tqdm/tqdm-4.46.1.ebuild b/dev-python/tqdm/tqdm-4.46.1.ebuild
index 75999c0d5faf..563276f5d141 100644
--- a/dev-python/tqdm/tqdm-4.46.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.46.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.47.0.ebuild b/dev-python/tqdm/tqdm-4.47.0.ebuild
new file mode 100644
index 000000000000..563276f5d141
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.47.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index bfb4bf77d368..29192b05e161 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
index 3fa3fd3b0a50..dc8549057553 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
index ee8b1e1ebccc..988d1c7f49e3 100644
--- a/dev-ruby/asciimath/asciimath-1.0.9.ebuild
+++ b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/pepijnve/asciimath"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/asciimath/asciimath-2.0.0.ebuild b/dev-ruby/asciimath/asciimath-2.0.0.ebuild
index a65964bf1a7e..eb017c70ce9d 100644
--- a/dev-ruby/asciimath/asciimath-2.0.0.ebuild
+++ b/dev-ruby/asciimath/asciimath-2.0.0.ebuild
@@ -17,3 +17,5 @@ LICENSE="MIT"
 SLOT="1"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index 8839ea91c17e..20409eedcb5d 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,3 +1,4 @@
 DIST kramdown-1.17.0.gem 260608 BLAKE2B 56f0abb2c94ab2de31bcd71940c22610efc8143c434295627513735b5983a369b0d9b36a88477a4e0b14bb23a3d314280702655c854cb7134e29bebc1f276966 SHA512 0f98f4234dec41b53d7f116be1075176c7fcbf21621c6f52a9e5b4055a777b01f1a0a912be81a651e85df022e7bab3ac183ee66cd87abeae092cd1920aceff04
 DIST kramdown-2.1.0.gem 119808 BLAKE2B a5beac52349fb49d315d83391d52574013bd76e084edb25a0b3bc0d813fc5b0dae0799a03bdd20fb500560effc94ad8f262fab9bbb8eef275aaead3405d3a64c SHA512 86a2934218365c71ff4f99591cba3b49ddc5ee60a78fcd7bf1f72e86281cda7bbea3c67b1b7caca6c4b8ca6e5b62d4df25e85089db659c93bd4da4b1c8eada69
 DIST kramdown-2.2.1.gem 121344 BLAKE2B e1da7e1289b64cc3d4db253330405b03b1a430a690e2f5b32970dc8c1d52bbf1f418e8aa1c597a3333141c3974893e1532e870a131fc297b9080b66bc6918882 SHA512 7c322010a8a418706c48d5a1011354aba215d50be94354fff93a636ff3453906bb381cf5669560a6bd10ecaf3bab7b04f446efa0a4b85322865b879f74de4c43
+DIST kramdown-2.3.0.gem 121344 BLAKE2B 0494afe84123503cb1e2f31c512c1b8cace1a81a3f32488e9719d47f1614a20fb86aa007187f2802e9b5c041031e8b6258da9909cbb1bbad0aa94d519821fb14 SHA512 a3ed8360de9208d5ce658d198763737826db943d23dda7ca9cfd507a4656c39f2b19ece78af87981b1177fe01690d6647c854092b230cf3a8a7d2823dc83d276
diff --git a/dev-ruby/kramdown/kramdown-2.3.0.ebuild b/dev-ruby/kramdown/kramdown-2.3.0.ebuild
new file mode 100644
index 000000000000..a94195768837
--- /dev/null
+++ b/dev-ruby/kramdown/kramdown-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
+HOMEPAGE="https://kramdown.gettalong.org/"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="latex"
+
+LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
+RDEPEND+=" ${LATEX_DEPS}"
+DEPEND+=" test? ( ${LATEX_DEPS} app-text/tidy-html5 )"
+
+ruby_add_rdepend "
+	dev-ruby/rexml
+	>=dev-ruby/rouge-1.8
+	>=dev-ruby/stringex-1.5.1
+	!!<dev-ruby/kramdown-1.17.0-r2:0"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( >=dev-ruby/minitest-5.0 )"
+
+all_ruby_prepare() {
+	if ! use latex; then
+		# Remove latex tests. They will fail gracefully when latex isn't
+		# present at all, but not when components are missing (most
+		# notable ucs.sty).
+		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/kramdown.1
+}
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
index 1528ade210d6..3e67847d11de 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rouge/rouge-3.19.0.ebuild b/dev-ruby/rouge/rouge-3.19.0.ebuild
index 97c051abf528..0e51302dab05 100644
--- a/dev-ruby/rouge/rouge-3.19.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.19.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index af87d8c83faf..1f1ca50dc8bd 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index 2441cace10f2..c36a393f45ee 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -27,7 +27,6 @@ DIST tl-interpreter-2020.tar.xz 6224 BLAKE2B 3059e1455571891f241dc68c574e5d50a77
 DIST tl-interpreter.doc-2020.tar.xz 122152 BLAKE2B 462274df025e3e18fefc2ee1f305097214653200f2a7c30535d8fe88adeb44208bbefcb21c1bc4ea22ac941e3aaf82ed37d7dff87605b59cbddc3d96a0c288fc SHA512 3408bcb3cd3e6da67294c830870534d3cd620b7abc3ad35d4833e30c831bf93d11dc06d00547888268870c75f6a6e2e861448a0fa197e3e5a3c10aaccc6e4dd8
 DIST tl-kanaparser-2020.tar.xz 4620 BLAKE2B 68674ab8fed99591ebbf664e39e696f8f0fd1b1b6079157b8536091797914950948617e1d879a332bc44f0cd239411daa03762459622e49a97f73abd898a7591 SHA512 a9db1fc66330bafc5fc26ed600f1779dce328d6234ebe930aaff65a02a0d740188e73c5f73a9c75d69926323a610dca4b37044e7357a141eae9bb3231fd3e272
 DIST tl-kanaparser.doc-2020.tar.xz 367048 BLAKE2B d3acc70338bf10ec26ffcee1b4a696b859e6ad143e7599dd0d31d7629e1b435de25a98be48a018e9e0f59a43e194d16ece7b1d67d598b7c692611fd4a91edd60 SHA512 9eb00a9652f22411f9ae0123bd2bda62af617f39ed3eb8266c4ca38ff0783722a3d1eb05a0fe1ef6a238a3132ade65c5ebd882309f154ca416e2191b9db44c4c
-DIST tl-lm-2020.tar.xz 11944808 BLAKE2B 0da72d50ed6681c9b473a24af1cc8b627377e64390f8d240a9d13d9a924168cc98fe655db52ed44027327e642bb3a11afafbe1fcbe2f52554edbcb843ad2c908 SHA512 f94af6c169ee05d3a2dceb00794feffb7808a4bedc05da7655ea74fbbf675047661f49f4f2542373e5fef60fc0f91ea9931b25bb10c1449f593b84ebf65cd154
 DIST tl-lua-uca-2020.tar.xz 588 BLAKE2B 2284226e2ba729ef956e1a16bb6b2c497b324275aca3876a1d6420232716751119d0be1469e8a431c2f7ecab6405d45b17d394006fc44ed4b78e72712be82499 SHA512 b131db0ac33891becaf6f3ac778e462ca1dd1b5b63de86bd9f46da5cf562dd43a55c7818f38c9ff1b9a3315ff5e89962d8b21d45953b8dd0eb8a013e6eaf0783
 DIST tl-lua-uca.doc-2020.tar.xz 58412 BLAKE2B 683332d997001c9d7e82c3945e095da2710f541a37899fecf125a19afdf3381ad402e591bf596604b51f16140643513e197cd94aa9033decb70f7bafe8efcc21 SHA512 a60dce7f573dc23246366f7ddc4b74a303b1bea889c5f4c646a35f4bbf84427ac54c65b8e8af93dfc3c30bb96f31dd5eb04f2f203db4ecdfb7c386febf34088e
 DIST tl-lua-uca.source-2020.tar.xz 70916 BLAKE2B d83efc49811073edebfcdc7118100c41b40d7b1cfe36d6a566d3179838c3edd18555b49b5a7ebb83e237077a2f0eff566eb4f8e1cb0ab41402cdf7e1a4286bea SHA512 1cabe6647dd31e145c47ea99db72fd90a8a922d6d09bf3a4806e0c329a5a192a48a6a34ae1c187eaf1363a142f389942ce62f07eb5469311f9e6c6d9a03b1106
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2020-r1.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
similarity index 81%
rename from dev-texlive/texlive-luatex/texlive-luatex-2020-r1.ebuild
rename to dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
index 78683cb4d250..ba8157da5373 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2020-r1.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-TEXLIVE_MODULE_CONTENTS="addliga auto-pst-pdf-lua barracuda bezierplot checkcites chickenize combofont cstypo ctablestack emoji enigma interpreter kanaparser lm lua-uca lua-ul lua-visual-debug luacode luacolor luahyphenrules luaimageembed luaindex luainputenc luaintro lualatex-doc lualatex-math lualatex-truncate lualibs luamplib luaotfload luapackageloader luarandom luatex85 luatexbase luatexko luatextra luavlna luaxml nodetree odsfile optex pdfarticle placeat plantuml selnolig spelling typewriter collection-luatex
+TEXLIVE_MODULE_CONTENTS="addliga auto-pst-pdf-lua barracuda bezierplot checkcites chickenize combofont cstypo ctablestack emoji enigma interpreter kanaparser lua-uca lua-ul lua-visual-debug luacode luacolor luahyphenrules luaimageembed luaindex luainputenc luaintro lualatex-doc lualatex-math lualatex-truncate lualibs luamplib luaotfload luapackageloader luarandom luatex85 luatexbase luatexko luatextra luavlna luaxml nodetree odsfile optex pdfarticle placeat plantuml selnolig spelling typewriter collection-luatex
 "
 TEXLIVE_MODULE_DOC_CONTENTS="addliga.doc auto-pst-pdf-lua.doc barracuda.doc bezierplot.doc checkcites.doc chickenize.doc combofont.doc cstypo.doc ctablestack.doc emoji.doc enigma.doc interpreter.doc kanaparser.doc lua-uca.doc lua-ul.doc lua-visual-debug.doc luacode.doc luacolor.doc luahyphenrules.doc luaimageembed.doc luaindex.doc luainputenc.doc luaintro.doc lualatex-doc.doc lualatex-math.doc lualatex-truncate.doc lualibs.doc luamplib.doc luaotfload.doc luapackageloader.doc luarandom.doc luatex85.doc luatexbase.doc luatexko.doc luatextra.doc luavlna.doc luaxml.doc nodetree.doc odsfile.doc optex.doc pdfarticle.doc placeat.doc plantuml.doc selnolig.doc spelling.doc typewriter.doc "
 TEXLIVE_MODULE_SRC_CONTENTS="chickenize.source ctablestack.source lua-uca.source lua-ul.source luacode.source luacolor.source luaindex.source luainputenc.source lualatex-doc.source lualatex-math.source lualatex-truncate.source lualibs.source luamplib.source luaotfload.source luatex85.source luatexbase.source luatextra.source nodetree.source placeat.source "
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2020
+>=dev-texlive/texlive-fontsrecommended-2020
 "
 RDEPEND="${DEPEND} dev-texlive/texlive-latexrecommended
 "
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3789ed89a10c..a312d9445545 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/anjuta/anjuta-3.34.0.ebuild b/dev-util/anjuta/anjuta-3.34.0.ebuild
index 8ea2a7e3db66..97bb17cc3827 100644
--- a/dev-util/anjuta/anjuta-3.34.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.34.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 IUSE="debug devhelp glade +introspection subversion terminal test vala"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/devhelp/devhelp-3.34.0.ebuild b/dev-util/devhelp/devhelp-3.34.0.ebuild
index 75ad41f460cd..2a8f559e7ffd 100644
--- a/dev-util/devhelp/devhelp-3.34.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
index 7b31970bdef4..2e418357d6dc 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
index 0d0b0d0a8d3c..9eaedd6076e3 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_app
 LICENSE="Intel-SDP"
 SLOT="0"
 IUSE="android +system-tbb system-clang +system-boost"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="bindist mirror"
 
 RDEPEND=">=virtual/opencl-3
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4f7ba0767d71..177f2c2abfa4 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,4 +2,5 @@ DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-util/lldb/lldb-10.0.0.ebuild b/dev-util/lldb/lldb-10.0.0.ebuild
index 4b669f2eea2a..deb734360d5b 100644
--- a/dev-util/lldb/lldb-10.0.0.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
diff --git a/dev-util/lldb/lldb-10.0.1_rc2.ebuild b/dev-util/lldb/lldb-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..2dfe01834ca3
--- /dev/null
+++ b/dev-util/lldb/lldb-10.0.1_rc2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 4648e0d09243..3bd2809c0bae 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 04edee339306..4ac5cf86e774 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1238,27 +1238,37 @@ unipatch() {
 				if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} -gt 4 ]]; then
 					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
 					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
+					UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
 				# optimization patch for gcc >= 8 and kernel ge 4.13
 				elif [[ "${GCC_MAJOR_VER}" -eq 8 ]]; then
 					# support old kernels for a period. For now, remove as all gcc versions required are masked
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
 					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
-				elif [[ "${GCC_MAJOR_VER}" -ge 9 ]] && [[ ${GCC_MINOR_VER} -ge 1 ]]; then
+					UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
+				elif [[ "${GCC_MAJOR_VER}" -eq 9 ]] && [[ ${GCC_MINOR_VER} -ge 1 ]]; then
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
 					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
+					UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
+				elif [[ "${GCC_MAJOR_VER}" -eq 10 ]] && [[ ${GCC_MINOR_VER} -ge 1 ]]; then
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
+					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
 				else
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
 					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
 					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
+					UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
 				fi
 			else
 				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
 				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
 				UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
 				UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
+				UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
 			fi
 		fi
 	done
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 298e3aed7374..9f7a8e3296f0 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -79,6 +79,11 @@ kernel-build_src_configure() {
 	restore_config .config
 	[[ -f .config ]] || die "Ebuild error: please copy default config into .config"
 
+	if [[ -z "${KV_LOCALVERSION}" ]]; then
+		KV_LOCALVERSION=$(sed -n -e 's#^CONFIG_LOCALVERSION="\(.*\)"$#\1#p' \
+			.config)
+	fi
+
 	mkdir -p "${WORKDIR}"/modprep || die
 	mv .config "${WORKDIR}"/modprep/ || die
 	emake O="${WORKDIR}"/modprep "${MAKEARGS[@]}" olddefconfig
@@ -110,9 +115,10 @@ kernel-build_src_test() {
 	emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
 		INSTALL_MOD_PATH="${T}" INSTALL_PATH="${ED}/boot"  "${targets[@]}"
 
-	kernel-install_test "${PV}" \
+	local ver="${PV}${KV_LOCALVERSION}"
+	kernel-install_test "${ver}" \
 		"${WORKDIR}/build/$(kernel-install_get_image_path)" \
-		"${T}/lib/modules/${PV}"
+		"${T}/lib/modules/${ver}"
 }
 
 # @FUNCTION: kernel-build_src_install
@@ -136,16 +142,17 @@ kernel-build_src_install() {
 	# note: we're using mv rather than doins to save space and time
 	# install main and arch-specific headers first, and scripts
 	local kern_arch=$(tc-arch-kernel)
-	dodir "/usr/src/linux-${PV}/arch/${kern_arch}"
-	mv include scripts "${ED}/usr/src/linux-${PV}/" || die
+	local ver="${PV}${KV_LOCALVERSION}"
+	dodir "/usr/src/linux-${ver}/arch/${kern_arch}"
+	mv include scripts "${ED}/usr/src/linux-${ver}/" || die
 	mv "arch/${kern_arch}/include" \
-		"${ED}/usr/src/linux-${PV}/arch/${kern_arch}/" || die
+		"${ED}/usr/src/linux-${ver}/arch/${kern_arch}/" || die
 
 	# remove everything but Makefile* and Kconfig*
 	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
 		-delete || die
 	find -type l -delete || die
-	cp -p -R * "${ED}/usr/src/linux-${PV}/" || die
+	cp -p -R * "${ED}/usr/src/linux-${ver}/" || die
 
 	cd "${WORKDIR}" || die
 	# strip out-of-source build stuffs from modprep
@@ -156,20 +163,20 @@ kernel-build_src_install() {
 			'(' -name '.*' -a -not -name '.config' ')' \
 		')' -delete || die
 	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${ver}"/ || die
 
 	# install the kernel and files needed for module builds
-	insinto "/usr/src/linux-${PV}"
+	insinto "/usr/src/linux-${ver}"
 	doins build/{System.map,Module.symvers}
 	local image_path=$(kernel-install_get_image_path)
-	cp -p "build/${image_path}" "${ED}/usr/src/linux-${PV}/${image_path}" || die
+	cp -p "build/${image_path}" "${ED}/usr/src/linux-${ver}/${image_path}" || die
 
 	# strip empty directories
 	find "${D}" -type d -empty -exec rmdir {} + || die
 
 	# fix source tree and build dir symlinks
-	dosym ../../../usr/src/linux-${PV} /lib/modules/${PV}/build
-	dosym ../../../usr/src/linux-${PV} /lib/modules/${PV}/source
+	dosym ../../../usr/src/linux-${ver} /lib/modules/${ver}/build
+	dosym ../../../usr/src/linux-${ver} /lib/modules/${ver}/source
 
 	save_config build/.config
 }
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index 8065a8f5638e..ab886d28faf0 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -20,6 +20,13 @@
 # Additionally, the inherited mount-boot eclass exports pkg_pretend.
 # It also stubs out pkg_preinst and pkg_prerm defined by mount-boot.
 
+# @ECLASS-VARIABLE: KV_LOCALVERSION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# A string containing the kernel LOCALVERSION, e.g. '-gentoo'.
+# Needs to be set only when installing binary kernels,
+# kernel-build.eclass obtains it from kernel config.
+
 if [[ ! ${_KERNEL_INSTALL_ECLASS} ]]; then
 
 case "${EAPI:-0}" in
@@ -311,21 +318,22 @@ kernel-install_pkg_postinst() {
 	if [[ -z ${ROOT} ]]; then
 		mount-boot_pkg_preinst
 
+		local ver="${PV}${KV_LOCALVERSION}"
 		local image_path=$(kernel-install_get_image_path)
 		if use initramfs; then
 			# putting it alongside kernel image as 'initrd' makes
 			# kernel-install happier
 			kernel-install_build_initramfs \
-				"${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" \
-				"${PV}"
+				"${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" \
+				"${ver}"
 		fi
 
-		kernel-install_install_kernel "${PV}" \
-			"${EROOT}/usr/src/linux-${PV}/${image_path}" \
-			"${EROOT}/usr/src/linux-${PV}/System.map"
+		kernel-install_install_kernel "${ver}" \
+			"${EROOT}/usr/src/linux-${ver}/${image_path}" \
+			"${EROOT}/usr/src/linux-${ver}/System.map"
 	fi
 
-	kernel-install_update_symlink "${EROOT}/usr/src/linux" "${PV}"
+	kernel-install_update_symlink "${EROOT}/usr/src/linux" "${ver}"
 }
 
 # @FUNCTION: kernel-install_pkg_prerm
@@ -345,10 +353,11 @@ kernel-install_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ -z ${ROOT} ]] && use initramfs; then
+		local ver="${PV}${KV_LOCALVERSION}"
 		local image_path=$(kernel-install_get_image_path)
 		ebegin "Removing initramfs"
-		rm -f "${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" &&
-			find "${EROOT}/usr/src/linux-${PV}" -depth -type d -empty -delete
+		rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" &&
+			find "${EROOT}/usr/src/linux-${ver}" -depth -type d -empty -delete
 		eend ${?}
 	fi
 }
@@ -361,18 +370,19 @@ kernel-install_pkg_config() {
 
 	mount-boot_pkg_preinst
 
+	local ver="${PV}${KV_LOCALVERSION}"
 	local image_path=$(kernel-install_get_image_path)
 	if use initramfs; then
 		# putting it alongside kernel image as 'initrd' makes
 		# kernel-install happier
 		kernel-install_build_initramfs \
-			"${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" \
-			"${PV}"
+			"${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" \
+			"${ver}"
 	fi
 
-	kernel-install_install_kernel "${PV}" \
-		"${EROOT}/usr/src/linux-${PV}/${image_path}" \
-		"${EROOT}/usr/src/linux-${PV}/System.map"
+	kernel-install_install_kernel "${ver}" \
+		"${EROOT}/usr/src/linux-${ver}/${image_path}" \
+		"${EROOT}/usr/src/linux-${ver}/System.map"
 }
 
 _KERNEL_INSTALL_ECLASS=1
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index c27de00d7147..90c3cd442f5d 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
index 722d6fb9276f..665870f47137 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/18" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/nautilus/nautilus-3.34.3.ebuild b/gnome-base/nautilus/nautilus-3.34.3.ebuild
index 3c04b20204ed..6a35a0d8f4eb 100644
--- a/gnome-base/nautilus/nautilus-3.34.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.34.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.58.1:2
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5c8f98377270..09f574a1ddee 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
index 3de5e4b82c8a..fd92bc61af76 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
@@ -16,7 +16,7 @@ SLOT="0/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
index 073b7890b043..3d5c7d9b8f15 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
index 4164b5dbe886..f1ea058fa16c 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
index 3a6f737099b9..f9651ce7e447 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
index 944f1dd0d65d..34a30e2716fc 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/TopIcons-plus-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
index 40cb7a81b786..33297d29337d 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index cfb88dbf9475..d2bd28734523 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/evolution/evolution-3.36.3.ebuild b/mail-client/evolution/evolution-3.36.3.ebuild
index a3cbc331a345..346822bfe965 100644
--- a/mail-client/evolution/evolution-3.36.3.ebuild
+++ b/mail-client/evolution/evolution-3.36.3.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d9b05ed7aee5..9aaa4419b404 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,7 +1,4 @@
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
-DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
-DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
-DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
-DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9
 DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670
 DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4
+DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
diff --git a/mail-client/neomutt/neomutt-20200313.ebuild b/mail-client/neomutt/neomutt-20200313.ebuild
deleted file mode 100644
index d195e95a243e..000000000000
--- a/mail-client/neomutt/neomutt-20200313.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable gpgme)"
-		"$(use_enable pgp-classic pgp)"
-		"$(use_enable smime-classic smime)"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf CCACHE=none "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n \
-			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use gpgme && ( use pgp-classic || use smime-classic ); then
-		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
-		ewarn "  and smime-classic (old smime) from your USE-flags and"
-		ewarn "  only enable gpgme."
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20200320.ebuild b/mail-client/neomutt/neomutt-20200320.ebuild
deleted file mode 100644
index d195e95a243e..000000000000
--- a/mail-client/neomutt/neomutt-20200320.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable gpgme)"
-		"$(use_enable pgp-classic pgp)"
-		"$(use_enable smime-classic smime)"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf CCACHE=none "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n \
-			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use gpgme && ( use pgp-classic || use smime-classic ); then
-		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
-		ewarn "  and smime-classic (old smime) from your USE-flags and"
-		ewarn "  only enable gpgme."
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20200424.ebuild b/mail-client/neomutt/neomutt-20200424.ebuild
deleted file mode 100644
index 169bb2a3aa6b..000000000000
--- a/mail-client/neomutt/neomutt-20200424.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable gpgme)"
-		"$(use_enable pgp-classic pgp)"
-		"$(use_enable smime-classic smime)"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf CCACHE=none "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n \
-			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > docs/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
-		emake -f docs/Makefile.fakedoc docs/neomutt.1
-		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
-		doman docs/neomutt.1 docs/neomuttrc.5
-	fi
-
-	dodoc LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use gpgme && ( use pgp-classic || use smime-classic ); then
-		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
-		ewarn "  and smime-classic (old smime) from your USE-flags and"
-		ewarn "  only enable gpgme."
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20200417.ebuild b/mail-client/neomutt/neomutt-20200626.ebuild
similarity index 100%
rename from mail-client/neomutt/neomutt-20200417.ebuild
rename to mail-client/neomutt/neomutt-20200626.ebuild
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
deleted file mode 100644
index f2648fcf92b8..000000000000
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	zlib? ( virtual/pkgconfig )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	crypt? (
-		>=app-crypt/gpgme-1.8.0[cxx,qt5]
-		dev-libs/mimetic
-	)
-	dbus? ( dev-qt/qtdbus:5 )
-	password? ( dev-libs/qtkeychain[qt5(+)] )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gpgme.patch"
-	"${FILESDIR}/${P}-gpg-tests.patch"
-	"${FILESDIR}/${P}-qt-5.11b3.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# the build system is taking a look at `git describe ... --dirty` and
-	# gentoo's modifications to CMakeLists.txt break these
-	sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-		-DWITH_GPGMEPP=$(usex crypt)
-		-DWITH_MIMETIC=$(usex crypt)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_ZLIB=$(usex zlib)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild b/mail-client/trojita/trojita-0.7-r4.ebuild
index e9b7c9e515a5..ec2dd0a0cc5f 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake virtualx xdg
 
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 5a5e69ea28d9..f77d7d1a6d5a 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b719fbe339ed..28038d3cdb08 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,4 +1,5 @@
 DIST postfix-3.5.1.tar.gz 4609587 BLAKE2B 94b06ed536417ca72729d93f03d4fa2dce602508e4c5816ad902740d4203ad3df66d7380ea41859ab75ab327c0f53bc2bbaf09ba45fe83490d02808426a6253d SHA512 9c091cda6c2d54fefc7093736f69dc60dc4d9d2d858260bde1430427bc49caa59f81aea7a992b9764998a4edaaa015ddd50392b8f0a1bccd15f52b563887a698
 DIST postfix-3.5.2.tar.gz 4611518 BLAKE2B 4bdf1876c6e210644541fb4fad6ecc4aad2f95afc1d3b7aa30c79e4ca8d2e1c24ad5541f235b8fea91b9831b9b967d6234aae3084938e334bc11a5777004134b SHA512 04e37c4542952dba0f3e44f10775c0bedf343e6382df14a9c43ebc80c005c3f6de68a4e7a7469f32ae74b8e50d10c089d4930eac0cd2e2a9ff1bd8d7481b3a76
 DIST postfix-3.5.3.tar.gz 4611925 BLAKE2B bba4b4b2e88753aff20462936bf053a6026e6e84e348887c318e10d6070374c28478f905c69168c018387dfd2d9ad25a8a0c0494d80360938ab9f16883137bfe SHA512 1d020292f244e770353efb634909afdc9ac29b81707547fda1089631febbb8ecdac7c43f6b6ec9bdc4084da2be320bc433064d293811424873062d71d3545235
-DIST postfix-3.6-20200620.tar.gz 4634959 BLAKE2B 3f4396f1d6ed8e25ab472284405ef352d8cb99e75bcbf4b036b7289f253bc9ccd5e37caa81324b0c9687b5279a7871e3154f0aa8c169e6415ffd89cf3d3096a0 SHA512 d28dccda01ef58bb2c60272e044f7bfc55c59b94d6af164592d9226909a1e1a96e7150df18700cdf87b017c79e6459331c8f5b797e2620a91c67d2dd699d67bd
+DIST postfix-3.5.4.tar.gz 4612431 BLAKE2B 482e9d2e3d82d0abbfe02c233608c5620238de34a3ff26a155c3bd9d39c020ab007b32ae549da12617c283b6a8882916bd84fb09a8f71613903acca7d4e7c0d6 SHA512 428c31bc9fea09f260333d6e3707f619424dd21f1f88c5935842b20b008f3a3a1555a962a7b98a0ae6b1c0367587f99064365403923ab1a8895023a10327a442
+DIST postfix-3.6-20200627.tar.gz 4635306 BLAKE2B 0b2d898fd9e415146b0fa83dd270b809aad133a89a5c7cc4c0909eba7b3995fe83f80c71f033bd3c496bd62658d68da4d97e0543a332818e04798b2df1c318f8 SHA512 76e5deff8b2a194e9c70ff2239ce112c90cd6984816a7f2c63925d6dbbf3ecede9147ecabbd0e70e6d9ee5ac01a2446cd8d60c506df166c729da977429cdfa54
diff --git a/mail-mta/postfix/postfix-3.5.4.ebuild b/mail-mta/postfix/postfix-3.5.4.ebuild
new file mode 100644
index 000000000000..15887b8c8b9a
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.5.4.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	)"
+
+RDEPEND="${DEPEND}
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	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 )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-certkey.patch"
+	"${FILESDIR}/${PN}-libressl-server.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	if has_version '<mail-mta/postfix-3.4'; then
+		elog
+		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+		elog "Before backing out to an older Postfix version, edit the master.cf"
+		elog "file and remove the postlog entry."
+		elog
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.6_pre20200620.ebuild b/mail-mta/postfix/postfix-3.6_pre20200627.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.6_pre20200620.ebuild
rename to mail-mta/postfix/postfix-3.6_pre20200627.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 98e07cbbea0a..130e0e6174d0 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/scrot/files/scrot-9999-Xcursor.patch b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
new file mode 100644
index 000000000000..dbb935219b35
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
@@ -0,0 +1,18 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -34,4 +34,4 @@
+ bin_PROGRAMS      = scrot
+ scrot_SOURCES       = main.c getopt.c getopt1.c getopt.h scrot.h \
+ options.c options.h debug.h imlib.c structs.h note.c note.h
+-scrot_LDADD         = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@
++scrot_LDADD         = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@
+--- a/src/scrot.h
++++ b/src/scrot.h
+@@ -40,7 +40,6 @@
+ #include <X11/cursorfont.h>
+ #include <X11/extensions/Xfixes.h>
+ #include <X11/extensions/Xcomposite.h>
+-#include <X11/Xcursor/Xcursor.h>
+ 
+ #include <stdio.h>
+ #include <string.h>
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index a3ef577a9be9..82d865e83c56 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 RDEPEND="
 	>=media-libs/giblib-1.2.3
 	x11-libs/libX11
-	x11-libs/libXcursor
+	x11-libs/libXcomposite
 	x11-libs/libXfixes
 	|| (
 		media-libs/imlib2[gif]
@@ -31,6 +31,9 @@ DEPEND="
 DOCS=(
 	AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
 )
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-Xcursor.patch
+)
 
 src_prepare() {
 	sed -i -e 's#-g -O3##g' src/Makefile.am || die
diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.9.ebuild
index e79822b715c4..13b00763e4b1 100644
--- a/media-gfx/shotwell/shotwell-0.30.9.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
index 7735d1a8248f..a519c8b9e1ba 100644
--- a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7849b2ca08d7..ff134883900f 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/graphene/graphene-1.10.0.ebuild b/media-libs/graphene/graphene-1.10.0.ebuild
index d8ea01f115ca..60a20dbffe3b 100644
--- a/media-libs/graphene/graphene-1.10.0.ebuild
+++ b/media-libs/graphene/graphene-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/grilo/grilo-0.3.12.ebuild b/media-libs/grilo/grilo-0.3.12.ebuild
index 6ee66555a0d2..02c6a9c0a785 100644
--- a/media-libs/grilo/grilo-0.3.12.ebuild
+++ b/media-libs/grilo/grilo-0.3.12.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection +network +playlist test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
index 783d12d0ae3b..87a99c982508 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-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="X bzip2 +introspection +orc vnc wayland"
 
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
index f0dbf9ecd1d6..ddfbd549540c 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
index d2b5fce632f8..05020372b438 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
index 1224f858dc28..ea99b5cda7c9 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
index fc0a67edaecb..56580d9773e9 100644
--- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
index 852ffebdf8bf..2bda89594bdd 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/jpeg/jpeg-9d.ebuild b/media-libs/jpeg/jpeg-9d.ebuild
index 9caa1bcc96a0..8839bf4b7e74 100644
--- a/media-libs/jpeg/jpeg-9d.ebuild
+++ b/media-libs/jpeg/jpeg-9d.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 06c26b854504..527e22390ba0 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="A library for accessing a CDDB server"
 HOMEPAGE="http://libcddb.sourceforge.net/"
@@ -17,7 +15,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-lin
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 RESTRICT="test"
 
@@ -25,22 +24,36 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/cddb/version.h )
 
-src_configure() {
-	local myeconfargs=( --without-cdio )
-	autotools-multilib_src_configure
+src_prepare() {
+	default
+	# Required for CONFIG_SHELL != bash (bug #528012)
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-cdio
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	autotools-multilib_src_compile
+multilib_src_compile() {
+	default
 
-	if use doc; then
-		cd "${S}"/doc
+	if use doc ; then
+		cd "${S}"/doc || die
 		doxygen doxygen.conf || die
 	fi
 }
 
-src_install() {
-	autotools-multilib_src_install
+multilib_src_install_all() {
+	default
 
-	use doc && dohtml "${S}"/doc/html/*
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if use doc ; then
+		docinto html
+		dodoc "${S}"/doc/html/*
+	fi
 }
diff --git a/media-libs/woff2/woff2-1.0.2-r2.ebuild b/media-libs/woff2/woff2-1.0.2-r2.ebuild
index 844fa73dc987..0a3b2ddb9883 100644
--- a/media-libs/woff2/woff2-1.0.2-r2.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 6cd3fb531842..ce82592a1824 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild
index d99a5ba77a65..6b02262ab9bc 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
 RESTRICT="!test? ( test )"
 
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
index ea99140ae620..d54499f4a7a4 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild
index 9fa68c00dbd7..1ae7b3de9496 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
index 007516ad48ca..2c15f3b2696c 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild
index 56af0f7bbf7b..2f6d9adba574 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild
index 0082680156e7..4ef03895d21e 100644
--- a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="bs2b elements for Gstreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.16.2.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.16.2.ebuild
index cef49eb46bab..c8b7cc68eab8 100644
--- a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild
index 6f1ac6f9c3fb..9f122536e5ca 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
index a926b1bf206f..cce2ab153da3 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild
index c13ca1ab3cf0..74f77d34e8b7 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG-DASH plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild
index fb477389f863..7b624153c864 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild
index 5fec54b56840..577e45af4741 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTS audio decoder plugin for Gstreamer"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild
index 47701a7b0087..4018df0116dc 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
index 3d6e999cbf8f..c8d270539c12 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
index 2ebd8dfa81fd..57dc8970f4ea 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild
index 4b4dd7aa9f88..3fa774a1b350 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild
index 8b6209f8be29..e63e3f34e65c 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
index 9d8a148f36ce..80003b354827 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
index 9fac1e982ded..a1e2bf4b6a8f 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
index 63827562ac34..343c25e66d5d 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-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="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild
index e5fd79a0c908..03a097c508f6 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP live streaming plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
index 62abb09cebfa..103920bf70eb 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
index a876b38f9ece..4cb1b1f6d9e0 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild
index ac2558ef9b38..c1520fde40bf 100644
--- a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Ladspa elements for Gstreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild
index 83b2debb3797..bd9f11b7643a 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
index dc2d2a67db92..0f8403073081 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild
index 65ba3d0085ff..7205c03c0e8f 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.265 decoder plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild
index d46fa53b6617..6a006e215cfa 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild
index f311c9065a0e..ee381d7c1a00 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild
index 1e79260fd310..7d466eb8488c 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
index b3cb05fd058e..0e26e649b31b 100644
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Lv2 elements for Gstreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
index 1ec5e0d48c9f..b5707813524a 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild
index 8015f18fd884..44088853fa43 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
index 8d2840963c90..244081e1998a 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-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=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild
index fa60a30b32e3..ce253ca8f066 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
index 5ab7a5777ec8..7b1b0c3f4e64 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild
index be905656d37d..256bea3532f4 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild
index f4123658470b..e0b18c05cd68 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild
index 1c535dd4ccde..0ea85975ebd1 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MusicIP audio fingerprinting plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild
index e8b879fe0a50..e5644c6dda26 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
index 8dd9c53214d9..0d9bf54a5dca 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
index 5e0a31289b3a..0468f946895e 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
index e72b4c0e847a..4f77bba55312 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild
index d8cad6ac5efa..ef1ea4168ada 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
index c96cb4d033ee..2006b29a3675 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild
index bf38e0705a27..e90fa0308017 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="RTMP source/sink plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild
index dc7fb9a598b3..7c38ca444988 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild
index 2f66c2930fb9..9d297e78e7f3 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild
index 97fc449dc9c9..6489606fa630 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Smooth Streaming plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild
index 0919d0527241..b367932d417e 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
index df13a379b20d..bd1c4465050d 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild
index cbce8a20a35a..51d6b81a3cb9 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
index a957993fd1cf..fb70a29d61c8 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
index 354c8fddcede..0fa1b1930a27 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild
index 7a6baa76f84a..14d2573142e4 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild
index ed4829174ed2..63a845e7756b 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
index 706c6ebf03ab..5d51a608f92e 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild
index b469ec76ad9a..88adea300f26 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="~amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
 
 # gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild
index 1e11d3ec5570..680710885690 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC encoder plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild
index 2c3718a8f38f..154e5e902145 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
index b13bafb72bd3..e24306304147 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit autotools gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild
index 47f56997a272..05d58895253d 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
index 791258164c5d..5965ccfbb716 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild
index e3b9207282b7..04e6dbe13fb9 100644
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE="gst-plugins-bad"
 inherit gstreamer
 
 DESCRIPTION="H.265 encoder plugin for GStreamer"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild
index d0e8fdd7372f..f60a82843d0a 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f2ea83863a00..1c6bb7d26556 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/gnome-music/gnome-music-3.34.6.ebuild b/media-sound/gnome-music/gnome-music-3.34.6.ebuild
index 25d04e56418e..c16a85cdeef5 100644
--- a/media-sound/gnome-music/gnome-music-3.34.6.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.34.6.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b0fd858e7395..04ca9a2b133d 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vdrtools-genindex/files/ldflags.diff b/media-video/vdrtools-genindex/files/ldflags.diff
deleted file mode 100644
index 7ec062e3ddcb..000000000000
--- a/media-video/vdrtools-genindex/files/ldflags.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur genindex-0.1.3.orig/Makefile genindex-0.1.3/Makefile
---- genindex-0.1.3.orig/Makefile	2010-09-24 14:55:48.000000000 +0200
-+++ genindex-0.1.3/Makefile	2010-09-24 14:56:06.000000000 +0200
-@@ -52,7 +52,7 @@
- # The main program:
- 
- genindex: $(OBJS)
--	$(CXX) $(CXXFLAGS) $^ -o $@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
- 
- rmstream: rmstream.o thread.o ringbuffer.o pes.o
- 	$(CXX) $(CXXFLAGS) $^ -o $@
diff --git a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r1.ebuild b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r1.ebuild
deleted file mode 100644
index 97399b70be66..000000000000
--- a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-SCRIPT="genindex"
-
-DESCRIPTION="VDR: genindex Script"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="http://www.muempf.de/down/${SCRIPT}-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${SCRIPT}-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/ldflags.diff
-}
-
-src_install() {
-	dodoc README
-	dobin genindex
-}
diff --git a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
index 3ec03fcdb001..64fc0d735883 100644
--- a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
+++ b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.muempf.de/down/${SCRIPT}-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S=${WORKDIR}/${SCRIPT}-${PV}
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 79692038c173..0a8ba91ce093 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 fc40224816f6..c2a92d634d28 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Jun 2020 05:08:22 +0000
+Mon, 29 Jun 2020 21:38:22 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fc40224816f6..c2a92d634d28 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Jun 2020 05:08:22 +0000
+Mon, 29 Jun 2020 21:38:22 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5c4d1ed3c40e..6150d0977282 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 58657258902c..14841cd7e6d5 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/caribou-0.4.21-r1 b/metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
index 263aebdc52fd..c030c1d7b3c1 100644
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Input assistive technology intended for switch and pointer users
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Caribou
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/glib[dbus] >=dev-python/pyatspi-2.1.90[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=gnome-base/gsettings-desktop-schemas-3 gnome-base/librsvg:2 sys-apps/dbus
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.21.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=180b8be13b0b6b3b1e92544c6cccb493
+_md5_=288440b77320676c16478a66c2603b81
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a96adf70cc90..b7c0fe12945a 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/syslog-ng-3.26.1-r1 b/metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1
index 303d15ae39f7..e6b7602f68f2 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.26.1/syslog-ng-3.26.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af28b7763bc2c11978bea5ff62c00a85
+_md5_=a1e57c8214b4228f6c95a8a539d2f22c
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index d0f5813262b5..3b2ff664a5e8 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/dpkg-1.20.2 b/metadata/md5-cache/app-arch/dpkg-1.20.2
new file mode 100644
index 000000000000..458189a73756
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.20.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils virtual/pkgconfig test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness )
+DESCRIPTION=Package maintenance system for Debian
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/dpkg
+IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.20.2.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ddd9b426b5f1543f260cf829fab56d3b
diff --git a/metadata/md5-cache/app-arch/rar-5.9.1_p20200625 b/metadata/md5-cache/app-arch/rar-5.9.1_p20200625
new file mode 100644
index 000000000000..65c9904ce7f8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rar-5.9.1_p20200625
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=all_sfx? ( app-arch/unrar )
+DESCRIPTION=RAR compressor/uncompressor
+EAPI=7
+HOMEPAGE=https://rarlab.com/
+IUSE=all_sfx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RAR BSD BSD-2
+RDEPEND=sys-libs/glibc
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.9.1_p20200625.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.9.1_p20200625.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.9.1_p20200625.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.9.1_p20200625.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-5.9.1_p20200625.exe )
+_md5_=36b4d6d83d44467cd464747e25f03928
diff --git a/metadata/md5-cache/app-arch/unrar-5.9.4 b/metadata/md5-cache/app-arch/unrar-5.9.4
new file mode 100644
index 000000000000..f3ef01a361ae
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.9.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=7
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0/5
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.9.4.tar.gz -> unrar-5.9.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=19425e9f14ea9ecf3bb440378479b690
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 8b482ec0c140..b199c3cba052 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/btrbk-0.29.1 b/metadata/md5-cache/app-backup/btrbk-0.29.1
index 9a5f787f76f1..15022d766c8e 100644
--- a/metadata/md5-cache/app-backup/btrbk-0.29.1
+++ b/metadata/md5-cache/app-backup/btrbk-0.29.1
@@ -5,10 +5,10 @@ DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
 EAPI=7
 HOMEPAGE=https://digint.ch/btrbk/
 IUSE=+mbuffer +doc
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
 SLOT=0
 SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.29.1.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=355d960776adad21a709248e582b500f
+_md5_=fefe95f43a5ac39437738d878c2de6ee
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index d0b1ae9824ad..daabe6de492b 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.20.3 b/metadata/md5-cache/app-crypt/libsecret-0.20.3
index 9efbeec94950..bdfb55ba29ab 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.20.3
+++ b/metadata/md5-cache/app-crypt/libsecret-0.20.3
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 IUSE=+crypt +introspection test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.44:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.20/libsecret-0.20.3.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52b1a808cfc74f9c9cc7834487c68336
+_md5_=a10b8227edc3cda61af2232a7c6a7347
diff --git a/metadata/md5-cache/app-crypt/rotix-0.83-r1 b/metadata/md5-cache/app-crypt/rotix-0.83-r1
index 3c55503247ab..834be331c73f 100644
--- a/metadata/md5-cache/app-crypt/rotix-0.83-r1
+++ b/metadata/md5-cache/app-crypt/rotix-0.83-r1
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=Rotix allows you to generate rotational obfuscations
 EAPI=7
 HOMEPAGE=https://github.com/shemminga/rotix
-KEYWORDS=amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/shemminga/rotix/releases/download/0.83/rotix_0.83.tar.gz -> rotix-0.83.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=123d58521a0ed63d7c38240f5dfa9013
+_md5_=81c8f398fe33495db274210f2047f42d
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.34.1 b/metadata/md5-cache/app-crypt/seahorse-3.34.1
index bd9b0c2910bc..1a217653a356 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.34.1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.34.1
@@ -4,10 +4,10 @@ DESCRIPTION=Manage your passwords and encryption keys
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
 IUSE=ldap zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.34/seahorse-3.34.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79889f34cd9b5bfcdd884f909e0025c6
+_md5_=c29d92b3d998e6e550fe72b4d38eefb0
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a7dede8dfdba..0f514fcf0a38 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/lxc-4.0.3 b/metadata/md5-cache/app-emulation/lxc-4.0.3
new file mode 100644
index 000000000000..60bdf7dd9b09
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.3
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=app-text/docbook-sgml-utils-0.6.14-r2 >=sys-kernel/linux-headers-3.2 apparmor? ( sys-apps/apparmor )
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
+IUSE=apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+PDEPEND=templates? ( app-emulation/lxc-templates )
+RDEPEND=app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6d6a2f6d953f468e8f8e8ce8ed66be88
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
index 4ec78be76b1b..1ec89a3514f9 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5.0.1
 SRC_URI=https://dl.winehq.org/wine/source/5.0/wine-5.0.1.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20191222.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=814fdf0ba2850fb68b92e48a433ca0c5
+_md5_=e892cd9917c7fb7f956bdd5b9abcbde0
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 2f9be0f9fe00..25808554c5b2 100644
Binary files a/metadata/md5-cache/app-laptop/Manifest.gz and b/metadata/md5-cache/app-laptop/Manifest.gz differ
diff --git a/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.0.3 b/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.0.3
new file mode 100644
index 000000000000..df3fa289a718
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.0.3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g virtual/pkgconfig
+DEFINED_PHASES=config install postinst postrm prepare unpack
+DEPEND=sys-power/tuxedo-cc-wmi
+DESCRIPTION=Tool to control performance, energy, fan and comfort settings on TUXEDO laptops
+EAPI=7
+HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-control-center
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3
+RDEPEND=sys-power/tuxedo-cc-wmi
+RESTRICT=strip splitdebug
+SLOT=0
+SRC_URI=https://rpm.tuxedocomputers.com/opensuse/15.1/x86_64/tuxedo-control-center_1.0.3.rpm
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=833a02a13176281a7e9ce523b6227531
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5
new file mode 100644
index 000000000000..56b843b3974d
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Module for Tuxedo Keyboard
+EAPI=7
+HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-keyboard
+IUSE=kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v2.0.5.tar.gz -> tuxedo-keyboard-2.0.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7088b5f6cc8187bdcf47e27b9e7c498b
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 63ee000b87c3..f9fd61782ff4 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/gnote-3.36.1 b/metadata/md5-cache/app-misc/gnote-3.36.1
index 46d637f39a00..8c31358a0b58 100644
--- a/metadata/md5-cache/app-misc/gnote-3.36.1
+++ b/metadata/md5-cache/app-misc/gnote-3.36.1
@@ -4,10 +4,10 @@ DESCRIPTION=Desktop note-taking application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
 IUSE=debug
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ FDL-1.1
 RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gspell-1.6.0:= >=dev-cpp/glibmm-2.62.0:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnote/3.36/gnote-3.36.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05037f139027b4be7f856095a52d24a0
+_md5_=f7098e1baab3164c1e4e9a85b80dda9b
diff --git a/metadata/md5-cache/app-misc/transfolio-1.0.1-r1 b/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
index b01d9de8e5e4..00b7ecb200c4 100644
--- a/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
+++ b/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Enables data transfer between the PC and the Atari Portfolio
 EAPI=7
 HOMEPAGE=http://leute.server.de/peichl/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://leute.server.de/peichl/transfolio.zip -> transfolio-1.0.1.zip
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eae2dbc7c035e03c6de755851c16dfab
+_md5_=7c034201d8f4919bd7966453a927f8fa
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 0ec1ef96c025..88f4d9b7cd64 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-6.4.5.2 b/metadata/md5-cache/app-office/libreoffice-6.4.5.2
new file mode 100644
index 000000000000..32fcff0bd066
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.4.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.4*
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.4.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.4.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.5//libreoffice-6.4.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.5//libreoffice-help-6.4.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.5.2/src/libreoffice-6.4.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.5.2/src/libreoffice-help-6.4.5.2.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0eda837d686854b045e868fbfed19c87
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.4.5.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.5.2
new file mode 100644
index 000000000000..c58eb61024d5
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.5.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DEFINED_PHASES=compile configure install prepare unpack
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	760ff223c2c4299b68ea901e24c4cabd
+_md5_=bfbf10a4278280e20ffbed5c22a9305f
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index d396e5d6c11b..8903a7970d37 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-18 b/metadata/md5-cache/app-portage/unsymlink-lib-18
new file mode 100644
index 000000000000..25702d9546d6
--- /dev/null
+++ b/metadata/md5-cache/app-portage/unsymlink-lib-18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Convert your system to SYMLINK_LIB=no
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( sys-apps/portage[python_targets_python3_6(-)] ) python_single_target_python3_7? ( sys-apps/portage[python_targets_python3_7(-)] ) python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v18.tar.gz -> unsymlink-lib-18.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=05c692f2b295a6d4d70acce0d13dcb98
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index a023e4064e0a..3ff372e19212 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/txt2man-1.7.1 b/metadata/md5-cache/app-text/txt2man-1.7.1
new file mode 100644
index 000000000000..7ff5c5c3994f
--- /dev/null
+++ b/metadata/md5-cache/app-text/txt2man-1.7.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Scripts to convert regular ASCII text to man pages
+EAPI=7
+HOMEPAGE=https://github.com/mvertes/txt2man
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash sys-apps/gawk
+SLOT=0
+SRC_URI=https://github.com/mvertes/txt2man/archive/txt2man-1.7.1.tar.gz
+_md5_=ccaccf0fd036674c0f279e980d71cfb7
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 8c8b5f6f0c1c..5b3c83779ffe 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629 b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629
new file mode 100644
index 000000000000..9d6dd4df4e98
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin:
+EAPI=7
+HOMEPAGE=https://github.com/nfnty/vim-nftables
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/nfnty/vim-nftables/archive/26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff.tar.gz -> vim-nftables-0_pre20200629.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=d95af924050a1b7e536fc824f96e6aa5
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6d947a48fc5d..d0e905cd74bf 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/catch-1.12.2 b/metadata/md5-cache/dev-cpp/catch-1.12.2
index cb229eae594e..2ad1bcba88a8 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.12.2
+++ b/metadata/md5-cache/dev-cpp/catch-1.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
 HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Boost-1.0
 RDEPEND=!<dev-cpp/catch-1.12.2:0
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/catchorg/Catch2/archive/v1.12.2.tar.gz -> Catch-1.12.2.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00086a79cd26692511b109fb840fc8ab
+_md5_=ed90045ef683b255c566dcbe3cfccb0a
diff --git a/metadata/md5-cache/dev-cpp/catch-2.9.1 b/metadata/md5-cache/dev-cpp/catch-2.9.1
index ad10a2805db8..ef5d50716f3d 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.9.1
+++ b/metadata/md5-cache/dev-cpp/catch-2.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
 HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.9.1.tar.gz -> Catch2-2.9.1.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56ee55fd45be2f084b2d21cb3d758079
+_md5_=5252b969dafff042a5a99a7d33c6a45c
diff --git a/metadata/md5-cache/dev-cpp/mm-common-1.0.0 b/metadata/md5-cache/dev-cpp/mm-common-1.0.0
index 9c07205b9f30..07739c352ff1 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-1.0.0
+++ b/metadata/md5-cache/dev-cpp/mm-common-1.0.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/1.0/mm-common-1.0.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=631c53f8ea0309e961f47441118c45e4
+_md5_=b1ac853135bfc5dc89f2acfc9d9bcb6c
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.8 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.8
new file mode 100644
index 000000000000..ab2181542417
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1 doc? ( app-doc/doxygen media-gfx/graphviz )
+DESCRIPTION=Wayland C++ bindings
+EAPI=7
+HOMEPAGE=https://github.com/NilsBrause/waylandpp
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
+SLOT=0/0.2
+SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.8.tar.gz -> waylandpp-0.2.8.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35de2b3f75525978287298d91587c8f3
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 5e0aefcf3e9b..053d45ee0fb3 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.45 b/metadata/md5-cache/dev-db/mariadb-10.1.45
index ebda0a96edfa..7949c368c62c 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.45
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.45
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup systemd systemtap static static-libs tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) kerberos? ( virtual/krb5 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.45/source/mariadb-10.1.45.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.1.45-patches-03.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c856f297e54ef9eef1b5c65e2d920fb
+_md5_=be779fe279a38fd6b08a9dc8c40762be
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.32 b/metadata/md5-cache/dev-db/mariadb-10.2.32
index 77f0d18de304..314273f527b1 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.32
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.32
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[static=] galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.32/source/mariadb-10.2.32.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.32-patches-03.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c359b59735ea4e688b354fcddef585e
+_md5_=9543faa948f88f97fd2039328c2cf879
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.23 b/metadata/md5-cache/dev-db/mariadb-10.3.23
index d51e1b78716e..ecc594b02799 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.23
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.23
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[static=] )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.23/source/mariadb-10.3.23.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.23-patches-03.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f896b783f412c3ce0a5eeac1cead3dfa
+_md5_=c1a9e886888b87fa749051837962a0f1
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.13 b/metadata/md5-cache/dev-db/mariadb-10.4.13
index 860a3757323a..7af708a01f54 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.13
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.13
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[static=] )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.13/source/mariadb-10.4.13.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.13-patches-03.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61269e6a41787347693d0b79b89ee87c
+_md5_=e9f8b70711ce0caae1c74e412b8f7581
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.9 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.9
index fdabd1ea949e..790f0dc9ec2a 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.9
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.9
@@ -5,11 +5,11 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+curl gnutls kerberos libressl +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.org/f/connector-c-3.1.9/mariadb-connector-c-3.1.9-src.tar.gz?serve -> mariadb-connector-c-3.1.9-src.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16f66cb6115a7988e25825161bc1f881
+_md5_=46ec1f39de16e640182ad12aa96deacf
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 1e1d4eb36135..d9ac60839f32 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/nasm-2.15.01 b/metadata/md5-cache/dev-lang/nasm-2.15.01
new file mode 100644
index 000000000000..d404e929aa99
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nasm-2.15.01
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/source-pro virtual/perl-File-Spec )
+DEFINED_PHASES=compile install
+DESCRIPTION=groovy little assembler
+EAPI=7
+HOMEPAGE=https://www.nasm.us/
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://www.nasm.us/pub/nasm/releasebuilds/2.15.01/nasm-2.15.01.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0e44dd5ee274cb95faa50c0efd120638
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.31 b/metadata/md5-cache/dev-lang/orc-0.4.31
index 438614b73c18..7804788b9df2 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.31
+++ b/metadata/md5-cache/dev-lang/orc-0.4.31
@@ -4,10 +4,10 @@ DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operatio
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=gtk-doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.31.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ac32ba68c98eb9376976da15511c12e
+_md5_=2ddf2a04d3717c6e2afbc814dacc2c81
diff --git a/metadata/md5-cache/dev-lang/python-3.7.8 b/metadata/md5-cache/dev-lang/python-3.7.8
new file mode 100644
index 000000000000..3e044c23089b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.7.8
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=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? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+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? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) 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.7/3.7m
+SRC_URI=https://www.python.org/ftp/python/3.7.8/Python-3.7.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.8.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0aa044fafeacf216a4a1b446706816a3
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.23 b/metadata/md5-cache/dev-lang/vala-0.40.23
index e0046375cd64..9ea2b448560a 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.23
+++ b/metadata/md5-cache/dev-lang/vala-0.40.23
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.23 valadoc? ( >=media-gfx/graphviz-2.16 )
 RESTRICT=!test? ( test )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.23.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31adf9ab65e22d2ea79c223a4a485ff4
+_md5_=dcab33f2ffc2a29362688d50d797a405
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.10 b/metadata/md5-cache/dev-lang/vala-0.46.10
index 0615ef52cc4c..555ff4e1666e 100644
--- a/metadata/md5-cache/dev-lang/vala-0.46.10
+++ b/metadata/md5-cache/dev-lang/vala-0.46.10
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.10 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.46
 SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.10.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=955f078b6a9e2e35cfd188f8290ec75a
+_md5_=4599debfb0995421bab6049210f63a5f
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.6 b/metadata/md5-cache/dev-lang/vala-0.48.6
index 44d65ec83c70..2dbff7c2edc4 100644
--- a/metadata/md5-cache/dev-lang/vala-0.48.6
+++ b/metadata/md5-cache/dev-lang/vala-0.48.6
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.6 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.48
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.6.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=802206f4c897e9bbe9d72a6592922a6c
+_md5_=90fc871f653c69b06da33eb8b822cca5
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 906a092f7468..a2293f5a7f8a 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/appstream-glib-0.7.17 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
index 64e12c6a21dd..0c624b92c418 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=6
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.17.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5355043fd472312f80d057d8e9fe9b6
+_md5_=697639cfc372a4709da2288bf1005090
diff --git a/metadata/md5-cache/dev-libs/chmlib-0.40-r1 b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
index 6f54da692cac..3f64f82527ca 100644
--- a/metadata/md5-cache/dev-libs/chmlib-0.40-r1
+++ b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile configure install test
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for MS CHM (compressed html) file format
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.jedrea.com/chmlib/
 IUSE=+examples static-libs
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.jedrea.com/chmlib/chmlib-0.40.tar.bz2
-_eclasses_=out-of-source	15edba2977da53bbf4d1e5a60abc0e34
-_md5_=8c5a48f5e985d48ba450c500d12bca82
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=331cdae1513a6f1839a1fbca401d33d2
diff --git a/metadata/md5-cache/dev-libs/freexl-1.0.1 b/metadata/md5-cache/dev-libs/freexl-1.0.1
index d78a8e100f31..cce0e32cf781 100644
--- a/metadata/md5-cache/dev-libs/freexl-1.0.1
+++ b/metadata/md5-cache/dev-libs/freexl-1.0.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install
 DEPEND=virtual/libiconv
 DESCRIPTION=Simple XLS data extraction library
 EAPI=6
-HOMEPAGE=http://www.gaia-gis.it/gaia-sins/
+HOMEPAGE=https://www.gaia-gis.it/fossil/freexl/index
 IUSE=static-libs
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=MPL-1.1
 RDEPEND=virtual/libiconv
 SLOT=0
-SRC_URI=http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.1.tar.gz
+SRC_URI=https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67d3cf6fd1262068711cc31c1ddabeeb
+_md5_=b16805685be6141f898c2029afeeb309
diff --git a/metadata/md5-cache/dev-libs/freexl-1.0.2 b/metadata/md5-cache/dev-libs/freexl-1.0.2
index 1c3818ac94c8..92d1bcc0807b 100644
--- a/metadata/md5-cache/dev-libs/freexl-1.0.2
+++ b/metadata/md5-cache/dev-libs/freexl-1.0.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install
 DEPEND=virtual/libiconv
 DESCRIPTION=Simple XLS data extraction library
 EAPI=6
-HOMEPAGE=http://www.gaia-gis.it/gaia-sins/
+HOMEPAGE=https://www.gaia-gis.it/fossil/freexl/index
 IUSE=static-libs
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MPL-1.1
 RDEPEND=virtual/libiconv
 SLOT=0
-SRC_URI=http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.2.tar.gz
+SRC_URI=https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b86a0412f092bd021b80f632dcf7881
+_md5_=98b5c2d36a6cd58ccb4d8918b0bd1a20
diff --git a/metadata/md5-cache/dev-libs/freexl-1.0.5 b/metadata/md5-cache/dev-libs/freexl-1.0.5
new file mode 100644
index 000000000000..06597639e9c9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/freexl-1.0.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/libiconv
+DESCRIPTION=Simple XLS data extraction library
+EAPI=7
+HOMEPAGE=https://www.gaia-gis.it/fossil/freexl/index
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MPL-1.1
+RDEPEND=virtual/libiconv
+SLOT=0
+SRC_URI=https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.5.tar.gz
+_md5_=8d14dc5cd47ac9cff714657d0528fe50
diff --git a/metadata/md5-cache/dev-libs/gjs-1.58.8 b/metadata/md5-cache/dev-libs/gjs-1.58.8
index efb1c6fdbe4a..d368092e5572 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.58.8
+++ b/metadata/md5-cache/dev-libs/gjs-1.58.8
@@ -4,11 +4,11 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk readline +sysprof test test
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.58.0 >=dev-libs/gobject-introspection-1.61.2:= readline? ( sys-libs/readline:0= ) dev-lang/spidermonkey:60 dev-libs/libffi:= cairo? ( x11-libs/cairo[X] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.58/gjs-1.58.8.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ed8ec64c2c227ebea8ba537f7ea808f
+_md5_=8a8c5695c404d998b013a675b296faab
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.4 b/metadata/md5-cache/dev-libs/libgusb-0.3.4
index 3aa4c873a562..2706b994c567 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.4
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=GObject wrapper for libusb
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libgusb
 IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
-_md5_=d945ea3b72765868aab441154c5c85a6
+_md5_=5a70c0a7f872d4af7f51caf8e944aa28
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.2 b/metadata/md5-cache/dev-libs/libjcat-0.1.2
deleted file mode 100644
index d3e17787a11c..000000000000
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml] dev-python/setuptools[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] dev-python/setuptools[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) gtk-doc? ( dev-util/gtk-doc ) man? ( sys-apps/help2man ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) dev-lang/vala:=
-DESCRIPTION=Library and tool for reading and writing Jcat files
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libjcat
-IUSE=gpg gtk-doc +introspection +man pkcs7 test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) dev-lang/vala:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.2.tar.gz -> libjcat-0.1.2.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7bb360777f051faa5e15e6879481c12
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.4 b/metadata/md5-cache/dev-libs/libmanette-0.2.4
index 9dbba4095d23..0100b2c807ea 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.4
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.4
@@ -5,11 +5,11 @@ DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 IUSE=+introspection +udev +vala
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7aa9b396850d6b645083150c9d9cb175
+_md5_=f1d3446ca3681e00f50da7ebd0481fbf
diff --git a/metadata/md5-cache/dev-libs/libressl-3.1.3 b/metadata/md5-cache/dev-libs/libressl-3.1.3
index 5d10e72b1cb3..a2e6c779de93 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.1.3
+++ b/metadata/md5-cache/dev-libs/libressl-3.1.3
@@ -5,7 +5,7 @@ DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
 EAPI=7
 HOMEPAGE=https://www.libressl.org/
 IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.3.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=87420a8e985d9389b93df897ae203f49
+_md5_=0064d6e29c1aa137ce617400aa668d0d
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.3 b/metadata/md5-cache/dev-libs/libsigc++-2.10.3
index 1d5e89a3ce77..f6a5643e2095 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.3
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.3
@@ -4,10 +4,10 @@ DESCRIPTION=Typesafe callback system for standard C++
 EAPI=6
 HOMEPAGE=http://libsigc.sourceforge.net/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.3.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7cbe3b332adeaa6b188365d52b1c5e2
+_md5_=7fd6e3dd4827624dab5899728c07c4d0
diff --git a/metadata/md5-cache/dev-libs/nss-3.51.1-r1 b/metadata/md5-cache/dev-libs/nss-3.51.1-r1
deleted file mode 100644
index 1a1ef031b447..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.51.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/nspr-4.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_51_1_RTM/src/nss-3.51.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cf5deb3b0a903d0653677e530519fd82
diff --git a/metadata/md5-cache/dev-libs/nss-3.52.1-r1 b/metadata/md5-cache/dev-libs/nss-3.52.1-r1
index 62dcb53f1e99..8c020ad39e93 100644
--- a/metadata/md5-cache/dev-libs/nss-3.52.1-r1
+++ b/metadata/md5-cache/dev-libs/nss-3.52.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=7
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_52_1_RTM/src/nss-3.52.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b43ce2e3c81f070196bc814ce1226e4d
+_md5_=f0d9c8808fc79406aaefd084f2eea8fc
diff --git a/metadata/md5-cache/dev-libs/nss-3.52 b/metadata/md5-cache/dev-libs/nss-3.54
similarity index 95%
rename from metadata/md5-cache/dev-libs/nss-3.52
rename to metadata/md5-cache/dev-libs/nss-3.54
index a2d535ef4868..0900115844d5 100644
--- a/metadata/md5-cache/dev-libs/nss-3.52
+++ b/metadata/md5-cache/dev-libs/nss-3.54
@@ -9,6 +9,6 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_52_RTM/src/nss-3.52.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_54_RTM/src/nss-3.54.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cf5deb3b0a903d0653677e530519fd82
+_md5_=995515cf9c613045e937f4eea6f1d1bd
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24 b/metadata/md5-cache/dev-libs/stfl-0.24
index 63e0bc6a90a8..6ca91693dedf 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24
+++ b/metadata/md5-cache/dev-libs/stfl-0.24
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=test
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3e5475e4dccd627830ea01e929650210
+_md5_=1b66b00af4a31bb7e47e7affeb0e07e5
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r2 b/metadata/md5-cache/dev-libs/stfl-0.24-r2
index 4c90f8642fc6..f3c2c21d52a6 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24-r2
+++ b/metadata/md5-cache/dev-libs/stfl-0.24-r2
@@ -4,11 +4,12 @@ DESCRIPTION=A library which implements a curses-based widget set for text termin
 EAPI=7
 HOMEPAGE=http://www.clifford.at/stfl/
 IUSE=examples perl python ruby static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=test
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e885eee4b60e6eae751f02e4e5e4e48
+_md5_=192ef5a6f26110a9c293d3471f987c5d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.6 b/metadata/md5-cache/dev-libs/vala-common-0.48.6
index 5a59b6300053..3399b19a84a8 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.6
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.6
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.6.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=a0ca68487df9530c27dc1c48ec17bd5a
+_md5_=a35b6f3466201c88aaff6981fdc6839a
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index bf4d3def5ade..9527a2feea4f 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc2
new file mode 100644
index 000000000000..b40f3266a399
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.1_rc2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,debug?] !sys-devel/llvm[ocaml(-)] !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.1_rc2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,debug?] !sys-devel/llvm[ocaml(-)]
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR )
+RESTRICT=!test? ( test )
+SLOT=0/10.0.1_rc2
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70d3a611ae69b305a54c0c8fd2bc014c
diff --git a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0 b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
index 48b9e0ccd56a..3e67f84545b6 100644
--- a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
+++ b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
@@ -4,11 +4,11 @@ DESCRIPTION=Use Moose or Mouse modules (DEPRECATED)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Any-Moose
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 ~arm hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7e3ff9114cccd2ac455c2eac4e3b6c19
+_md5_=79b7d32eb99bd72d423cff743258c495
diff --git a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r2 b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r2
new file mode 100644
index 000000000000..14f36f3ec161
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-perl/Class-ErrorHandler >=dev-perl/Convert-ASN1-0.100.0 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read/write encrypted ASN.1 PEM files
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-PEM
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-ErrorHandler >=dev-perl/Convert-ASN1-0.100.0 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Convert-PEM-0.08.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=3187253a175d7f7cc4aa2e1109498498
diff --git a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r3 b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r3
new file mode 100644
index 000000000000..63bd6009ac25
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r3
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-perl/MIME-tools-4.109.0 dev-perl/IO-stringy virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A Perl module for reading TNEF files
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-TNEF
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/MIME-tools-4.109.0 dev-perl/IO-stringy dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Convert-TNEF-0.18.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=6dc5d885c7ca6dfd7c5f3a8582d7b59e
diff --git a/metadata/md5-cache/dev-perl/Cookie-Baker-0.110.0 b/metadata/md5-cache/dev-perl/Cookie-Baker-0.110.0
new file mode 100644
index 000000000000..b4440621ff92
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cookie-Baker-0.110.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Exporter dev-perl/URI xs? ( >=dev-perl/Cookie-Baker-XS-0.110.0 ) >=dev-perl/Module-Build-Tiny-0.35.0 test? ( >=virtual/perl-Test-Simple-0.980.0 dev-perl/Test-Time ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
+DESCRIPTION=Cookie string generator / parser
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Cookie-Baker
+IUSE=test +xs
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter dev-perl/URI xs? ( >=dev-perl/Cookie-Baker-XS-0.110.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.11.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=f2a83fbc3b301bfdebd4659903f4b28f
diff --git a/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.110.0 b/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.110.0
new file mode 100644
index 000000000000..c99904f159bb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.110.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Accelerate Cookie::Baker's crush_cookie
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Cookie-Baker-XS
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-XS-0.11.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=33d8481efd17b58b873f1ed3dbad34ea
diff --git a/metadata/md5-cache/dev-perl/Coro-6.514.0-r1 b/metadata/md5-cache/dev-perl/Coro-6.514.0-r1
new file mode 100644
index 000000000000..148976f91498
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Coro-6.514.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/AnyEvent-5 ev? ( >=dev-perl/EV-4.0.0 ) event? ( >=dev-perl/Event-0.890.0 ) >=dev-perl/Guard-0.500.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Storable-2.150.0 dev-perl/common-sense dev-perl/Canary-Stability >=virtual/perl-ExtUtils-MakeMaker-6.520.0 dev-lang/perl
+DESCRIPTION=The only real threads in perl
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Coro
+IUSE=+ev event examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ ) LGPL-2.1+ || ( BSD-2 GPL-2+ )
+RDEPEND=>=dev-perl/AnyEvent-5 ev? ( >=dev-perl/EV-4.0.0 ) event? ( >=dev-perl/Event-0.890.0 ) >=dev-perl/Guard-0.500.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Storable-2.150.0 dev-perl/common-sense dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.514.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=f421db6f71ba003c6d0a9acbdaa14929
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.190.0 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.190.0
new file mode 100644
index 000000000000..40432509968d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.190.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-Test virtual/perl-Test-Simple virtual/perl-Time-Piece ) dev-lang/perl
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.19.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=60ccfe439199ee77cdc71467d82942c8
diff --git a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r2 b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r2
new file mode 100644
index 000000000000..17e43bbc557c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Crypt-CBC ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl Blowfish encryption module
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-Blowfish
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Crypt-IDEA
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=2268e854105a79ecab074f860c7cd1f8
diff --git a/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r2 b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r2
new file mode 100644
index 000000000000..44fe1a5546c7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=virtual/perl-Test-Simple-0.480.0 dev-perl/Test-Taint ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=CAST5 block cipher in pure Perl
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-CAST5_PP
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BO/BOBMATH/Crypt-CAST5_PP-1.04.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=cc91dab57764f011aca91cddb506cb3b
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r2 b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r2
new file mode 100644
index 000000000000..fe67c6823a7d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Digest-MD5-2.0.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-IDEA dev-perl/Crypt-Rijndael ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Encrypt Data with Cipher Block Chaining Mode
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-CBC
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=3a79b92b1891a921fad4aa61cb581725
diff --git a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0 b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
index 4d0d79af0197..8c2bd9870028 100644
--- a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
+++ b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Temporary changing working directory (chdir)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Cwd-Guard
 IUSE=test minimal
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=37f817aecd90a9e793dd3430bfc1df43
+_md5_=bb3ee5b59b5eed1cf4b32526d0c122de
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0 b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
index 9ba99a46b9d0..3579f25f2a2c 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
@@ -4,11 +4,11 @@ DESCRIPTION=Check the compiler's availability
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Devel-CheckCompiler
 IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Temp virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b7fc483c8379037e619c918d7676f3f
+_md5_=13bdb4a718919de3aa4dd1bd8f6f71bb
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0 b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
index 5d12b422dda9..7f4d02fc68ea 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
+++ b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for replacing a link by a copy of the linked file
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/File-Copy-Link
 IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RM/RMBARKER/File-Copy-Link-0.140.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e2146d2f7b623c9d44077c67984e37ca
+_md5_=e9e5e5044828e0bd183f4355cd0c490a
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index dbdd8d788b76..376f519d96ee 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/Module-Build-XSUtil-0.180.0 b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
index 1d4b4e870437..19c788a6f444 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Module::Build class for building XS modules
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Module-Build-XSUtil
 IUSE=test examples
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-CheckCompiler virtual/perl-Devel-PPPort virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Path virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2d62ebd7844db72f2aee498d6bdf4442
+_md5_=c5fe2a287d29c612fcda88e5dc2c9b79
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0 b/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
index eb352ebc43be..4692ac9f181a 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
@@ -4,11 +4,11 @@ DESCRIPTION=Organise your Moose types in libraries
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MooseX-Types
 IUSE=test examples
-KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Carp-Clan-6 virtual/perl-Exporter dev-perl/Module-Runtime >=dev-perl/Moose-1.60.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-perl/Sub-Exporter >=dev-perl/Sub-Exporter-ForMethods-0.100.52 dev-perl/Sub-Install dev-perl/Sub-Name >=dev-perl/namespace-autoclean-0.160.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9d5a2f5be432d84b7b90c5b1cf086bec
+_md5_=dc5cf5f85fd76420fc6066d6758667ce
diff --git a/metadata/md5-cache/dev-perl/Mouse-2.4.10 b/metadata/md5-cache/dev-perl/Mouse-2.4.10
index 7ce71e17fa63..89ab835f1413 100644
--- a/metadata/md5-cache/dev-perl/Mouse-2.4.10
+++ b/metadata/md5-cache/dev-perl/Mouse-2.4.10
@@ -4,11 +4,11 @@ DESCRIPTION=Moose minus the antlers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mouse
 IUSE=test examples
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-v2.4.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=95236aab66f47a656035c992be8e1f41
+_md5_=2d5dfe440e8d5d9e9a94949a501b64c0
diff --git a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2 b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
index d50a312b70a1..20e2536cfea5 100644
--- a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
+++ b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Extend your attribute interfaces for Mouse
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MouseX-NativeTraits
 IUSE=test examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mouse-0.820.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=594cc5bf48238300c23ec51035e076a2
+_md5_=e7f8131d66842c4b49ff6f75612d3e0c
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52 b/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
index bce4e8220091..881e1e45780c 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
@@ -4,11 +4,11 @@ DESCRIPTION=Helper routines for using Sub::Exporter to build methods
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Sub-Exporter-ForMethods
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.978.0 dev-perl/Sub-Name dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=aafea21c96f178be5788cb7739fd06f0
+_md5_=be3e55a67a7fa0aeb63faaf5a9292e08
diff --git a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1 b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
index 03536c293864..51af87c5e19e 100644
--- a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl bindings for libxcb
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/X11-XCB
 IUSE=test test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/Mouse dev-perl/MouseX-NativeTraits dev-perl/Try-Tiny dev-perl/XML-Descent dev-perl/XML-Simple >=virtual/perl-XSLoader-0.20.0 >=x11-libs/libxcb-1.2 x11-libs/xcb-util x11-libs/xcb-util-wm dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=524b623dbf0fed9b0171e14555c42027
+_md5_=06932106228d99af18d9adaf2b687a1f
diff --git a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0 b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
index 96ab02d3440e..b20c2d018886 100644
--- a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
+++ b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
@@ -4,11 +4,11 @@ DESCRIPTION=Recursive decent XML parsing
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Descent
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-TokeParser dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=82bf69c3ca56162e8f3062add4b1c1df
+_md5_=cb48d7494deb38a0f80bf45c67f1e041
diff --git a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0 b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
index cefaf110f8fe..54c7a04cd1de 100644
--- a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
+++ b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simplified interface to XML::Parser
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-TokeParser
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d76bb5a91c128c4c14bc845bd5c7b45b
+_md5_=69731afcdc8a1e2a8fdfe0d240ab0034
diff --git a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3 b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
index ff49b540aee2..77afb0a9eef0 100644
--- a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
+++ b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Opaque, extensible XS pointer backed objects using sv_magic
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XS-Object-Magic
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4cbaf99567d71de855d7e1526486e8fb
+_md5_=a34b13a7daa1dbf0b94a64377b7f7152
diff --git a/metadata/md5-cache/dev-perl/local-lib-2.0.24 b/metadata/md5-cache/dev-perl/local-lib-2.0.24
index 925876438456..915297e229a1 100644
--- a/metadata/md5-cache/dev-perl/local-lib-2.0.24
+++ b/metadata/md5-cache/dev-perl/local-lib-2.0.24
@@ -4,11 +4,11 @@ DESCRIPTION=create and use a local lib/ for perl modules with PERL5LIB
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/local-lib
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-1.820.0 >=virtual/perl-ExtUtils-Install-1.430.0 >=virtual/perl-ExtUtils-MakeMaker-7.0.0 >=dev-perl/Module-Build-0.360.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e2e7f602773a2ec4e5b8bb023eb8b8c8
+_md5_=6fe10c84d4cdac660582d7900dd733d5
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index ddfb54626b73..d7008b9adc12 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.9 b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.9
new file mode 100644
index 000000000000..7fdac366a7de
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-PEAR )
+DESCRIPTION=Create and manipulate mime messages with PHP
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/Mail_Mime
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pear.php.net/get/Mail_Mime-1.10.9.tgz
+_eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
+_md5_=fa09fd9c9db9dbe9fdef3366d2191fb7
diff --git a/metadata/md5-cache/dev-php/composer-1.10.8 b/metadata/md5-cache/dev-php/composer-1.10.8
new file mode 100644
index 000000000000..08eb04af4915
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-1.10.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Dependency Manager for PHP
+EAPI=7
+HOMEPAGE=https://github.com/composer/composer
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/1.10.8.tar.gz -> composer-1.10.8.tar.gz
+_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 09970dcf2618..dab9feecb55b 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/cheroot-8.3.0 b/metadata/md5-cache/dev-python/cheroot-8.3.0
index 74381c710243..a9829bc4b498 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.3.0
+++ b/metadata/md5-cache/dev-python/cheroot-8.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by Che
 EAPI=7
 HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.3.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5be7f5821dd352df48ba0c324da395f3
+_md5_=be2c9d724c359371b849e4708bfdfc0e
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.5.0 b/metadata/md5-cache/dev-python/cherrypy-18.5.0
index 799473ead865..fde233566ff1 100644
--- a/metadata/md5-cache/dev-python/cherrypy-18.5.0
+++ b/metadata/md5-cache/dev-python/cherrypy-18.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
 EAPI=7
 HOMEPAGE=https://www.cherrypy.org https://pypi.org/project/CherryPy/
 IUSE=ssl test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cheroot-8.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/portend-2.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-18.5.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=94c921d9e7f4038d15c1813c70197808
+_md5_=b6ee4a64c6978c0c2653ee75a6e82c1b
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.0 b/metadata/md5-cache/dev-python/clang-python-10.0.0
index 982b7f241417..d957f157b7f0 100644
--- a/metadata/md5-cache/dev-python/clang-python-10.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-10.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for sys-devel/clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=>=sys-devel/clang-10.0.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7b631fda4eaea64232e2dca79d833575
+_md5_=72c4d22119cac9257e9b19f9a8ce2cc5
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.1_rc2 b/metadata/md5-cache/dev-python/clang-python-10.0.1_rc2
new file mode 100644
index 000000000000..e89f0bb5cb47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-10.0.1_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-10.0.1_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-10.0.1_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
diff --git a/metadata/md5-cache/dev-python/django-2.2.13 b/metadata/md5-cache/dev-python/django-2.2.13
index cd36dae58245..536225b2ed8a 100644
--- a/metadata/md5-cache/dev-python/django-2.2.13
+++ b/metadata/md5-cache/dev-python/django-2.2.13
@@ -4,7 +4,7 @@ DESCRIPTION=High-level Python web framework
 EAPI=7
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
 IUSE=doc sqlite test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sqlparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.13.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a57f9b22928130746c6ff7e15823637
+_md5_=549a91af3d79382a8c2e17eea74459ab
diff --git a/metadata/md5-cache/dev-python/gst-python-1.16.2 b/metadata/md5-cache/dev-python/gst-python-1.16.2
index 07efa0498b59..f4a632372c6f 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.16.2
+++ b/metadata/md5-cache/dev-python/gst-python-1.16.2
@@ -5,11 +5,11 @@ DESCRIPTION=A Python Interface to GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=media-libs/gstreamer-1.16.2:1.0[introspection] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4470901b632982b9fc5c92c8f9238a68
+_md5_=f083a4e845283c37450cad7abc53e069
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0 b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
index d382cfe4c9a3..dd5bd5b66a8b 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=Classes used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.classes
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-3.1.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ef54ea7159311fcf0d5c73317ad95a0b
+_md5_=9188852469b6f0f4a167586abd97aecb
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.0.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
index 7307e82c8e22..a777677fc5a8 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Models and classes to supplement the stdlib collections module
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.collections
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ae3590cbc3259e8b20d3d9c03e46c319
+_md5_=959d5f75c713a2c65c700e063d1a53c6
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1 b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
index 2d993cabc921..2606a9733422 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Additional functions used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.functools
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.0.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=49f7ebbc6bf9f0e92f3b82a1e6099a26
+_md5_=1a0f75d10c29f206149bd611bc13269e
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.2.0 b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
index 9ee5d1eeac33..43b97dfc459f 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.2.0
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Text utilities used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.text
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.2.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9401eed5887d298c2e2bce4ca6ccb183
+_md5_=d4747e548cd4b940e0b3e84ad4aa057a
diff --git a/metadata/md5-cache/dev-python/lit-10.0.0 b/metadata/md5-cache/dev-python/lit-10.0.0
index 113c1589f1af..352647c9a6d0 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.0
+++ b/metadata/md5-cache/dev-python/lit-10.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=82227748b5116f2c614059c228df94e9
+_md5_=a14c56786a19a0789b599e9f2344e9b4
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1_rc2 b/metadata/md5-cache/dev-python/lit-10.0.1_rc2
new file mode 100644
index 000000000000..f9eed41340c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-10.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a493a878f42df6ce57284b750caa3713
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.1.2 b/metadata/md5-cache/dev-python/matplotlib-3.1.2
index 8a27e8838405..1d9a3175fc3c 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.1.2
+++ b/metadata/md5-cache/dev-python/matplotlib-3.1.2
@@ -5,7 +5,7 @@ DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=7
 HOMEPAGE=https://matplotlib.org/
 IUSE=cairo doc excel examples gtk3 latex qt5 test tk wxwidgets python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/cycler[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wxwidgets? ( dev-python/wxpython:*[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( cairo gtk3 latex qt5 tk ) || ( python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.1.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=de5fecb618ae08d6179a6b8bf5a0ee4c
+_md5_=7e36965d8137454ba665c0ccbbe1cbbe
diff --git a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1 b/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1
index 3cb977d34421..9892b3a9b8c0 100644
--- a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Pure python plotting library with matlab like syntax (py2 version)
 EAPI=6
 HOMEPAGE=https://matplotlib.org/
 IUSE=cairo excel gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cycler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/python-dateutil:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !<dev-python/matplotlib-3 >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=test? ( cairo gtk3 latex qt5 tk wxwidgets ) || ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.5.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=911275636aef0d514bd51640ceae4405
+_md5_=7c4dc70ecde9e13e45e0979d390cb0bd
diff --git a/metadata/md5-cache/dev-python/misaka-1.0.2 b/metadata/md5-cache/dev-python/misaka-1.0.2
deleted file mode 100644
index de34a381ff65..000000000000
--- a/metadata/md5-cache/dev-python/misaka-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=The Python binding for Sundown, a markdown parsing library
-EAPI=5
-HOMEPAGE=https://misaka.61924.nl/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/m/misaka/misaka-1.0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9d27e1db38db3d3986661d596536ddb
diff --git a/metadata/md5-cache/dev-python/misaka-2.1.1 b/metadata/md5-cache/dev-python/misaka-2.1.1
new file mode 100644
index 000000000000..8deb6af9f7d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/misaka-2.1.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A CFFI binding for Hoedown, a markdown parsing library
+EAPI=7
+HOMEPAGE=http://misaka.61924.nl/ https://github.com/FSX/misaka
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/FSX/misaka/archive/v2.1.1.tar.gz -> misaka-2.1.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7e3fb6348c83fc3b2a25e4a29685b38c
diff --git a/metadata/md5-cache/dev-python/objgraph-3.4.1 b/metadata/md5-cache/dev-python/objgraph-3.4.1
index f56c3f318c25..2d4af7a122c3 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.4.1
+++ b/metadata/md5-cache/dev-python/objgraph-3.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Draws Python object reference graphs with graphviz
 EAPI=7
 HOMEPAGE=https://mg.pov.lt/objgraph/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.4.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2e4c318a6fcf5d611176a414583d24f
+_md5_=0001cb4ff2dbcb5c5c9c58e570ce8dd7
diff --git a/metadata/md5-cache/dev-python/pyopencl-2019.1.2 b/metadata/md5-cache/dev-python/pyopencl-2019.1.2
index 5d3cf8f33d6a..a091734b79d3 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2019.1.2
+++ b/metadata/md5-cache/dev-python/pyopencl-2019.1.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python wrapper for OpenCL
 EAPI=7
 HOMEPAGE=https://mathema.tician.de/software/pyopencl https://pypi.org/project/pyopencl/
 IUSE=examples opengl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/decorator-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytools-2017.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=virtual/opencl-2 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2019.1.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=554f8d0d89193f6650fce249c5c237d0
+_md5_=a74e75d38157df42f154b29c3b2949c4
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.1.0 b/metadata/md5-cache/dev-python/pytest-mock-3.1.0
index a4dcbde83c16..5ec602cf346d 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.1.0
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.1.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eda95a76f3f785f538386ef9229720b8
+_md5_=0472ca73d3873d02d358b5c1bb62d869
diff --git a/metadata/md5-cache/dev-python/pytest-services-2.0.1 b/metadata/md5-cache/dev-python/pytest-services-2.0.1
index fbf3895df4d4..a356fb445ba2 100644
--- a/metadata/md5-cache/dev-python/pytest-services-2.0.1
+++ b/metadata/md5-cache/dev-python/pytest-services-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of fixtures and utility functions to run service processe
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-services
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-services/archive/2.0.1.tar.gz -> pytest-services-2.0.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=827fce11cf5c9145a69f8f55068ec90c
+_md5_=8f0afd663ffc21b51eda93fdd06ffd4a
diff --git a/metadata/md5-cache/dev-python/tempora-3.0.0 b/metadata/md5-cache/dev-python/tempora-3.0.0
index 78a664290ff1..23470f247110 100644
--- a/metadata/md5-cache/dev-python/tempora-3.0.0
+++ b/metadata/md5-cache/dev-python/tempora-3.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/tempora
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-3.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0cddddb6725d1afffe056fff3fb57429
+_md5_=d8a4a79de1250f9973097d8519c77773
diff --git a/metadata/md5-cache/dev-python/tqdm-4.46.1 b/metadata/md5-cache/dev-python/tqdm-4.46.1
index a2e19510e023..86054abebd21 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.46.1
+++ b/metadata/md5-cache/dev-python/tqdm-4.46.1
@@ -4,7 +4,7 @@ DESCRIPTION=Add a progress meter to your loops in a second
 EAPI=7
 HOMEPAGE=https://github.com/tqdm/tqdm
 IUSE=examples test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.46.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0073c95b949fea1a095a942723c69378
+_md5_=bbbc135a0f1a2663cac848cc6f761e76
diff --git a/metadata/md5-cache/dev-python/tqdm-4.47.0 b/metadata/md5-cache/dev-python/tqdm-4.47.0
new file mode 100644
index 000000000000..1a47e512d981
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.47.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Add a progress meter to your loops in a second
+EAPI=7
+HOMEPAGE=https://github.com/tqdm/tqdm
+IUSE=examples test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tqdm/tqdm-4.47.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bbbc135a0f1a2663cac848cc6f761e76
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index a397d3f328af..d374864bdcf5 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
index ccd072376236..b8d921d6ecc1 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
@@ -4,7 +4,7 @@ DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other
 EAPI=6
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.10.tar.gz -> asciidoctor-2.0.10.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=534822486695844168931741e19bf2d1
+_md5_=2203e0e06abd11256d5004ffe7c14cd5
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index bdf1c3764761..3ced95669621 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.9
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
@@ -5,7 +5,7 @@ DESCRIPTION=A pure Ruby AsciiMath parsing and conversion library
 EAPI=7
 HOMEPAGE=https://github.com/pepijnve/asciimath
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=19ae596016dabf95856696c0844218f9
+_md5_=7a2addc0410a1a78d917b7740ac4622b
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.0 b/metadata/md5-cache/dev-ruby/asciimath-2.0.0
index bad7e88c9e18..190d2123f6b4 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.0
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.0
@@ -1,4 +1,4 @@
-BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=A pure Ruby AsciiMath parsing and conversion library
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b7c35a84023fc6ee8eccfd6a6abe6041
+_md5_=73b815922c5fa0720d202457a29132d9
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.0 b/metadata/md5-cache/dev-ruby/kramdown-2.3.0
new file mode 100644
index 000000000000..27ade69bd78c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/rexml[ruby_targets_ruby25(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby25(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby25(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rexml[ruby_targets_ruby26(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby26(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby26(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/tidy-html5 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
+EAPI=7
+HOMEPAGE=https://kramdown.gettalong.org/
+IUSE=latex test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
+LICENSE=MIT
+RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby25? ( dev-ruby/rexml[ruby_targets_ruby25(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby25(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby25(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rexml[ruby_targets_ruby26(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby26(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby26(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/kramdown-2.3.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d5d978b11c76639fd582257082630ec3
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
index 985d5f65a88e..7b51c6c7d3b4 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Power Assert for Minitest
 EAPI=7
 HOMEPAGE=https://github.com/hsbt/minitest-power_assert
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/minitest:*[ruby_targets_ruby24(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/minitest:*[ruby_targets_ruby25(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/minitest:*[ruby_targets_ruby26(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitest:*[ruby_targets_ruby27(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-power_assert-0.3.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d24914fb3c1a9cd3153ae28e15d0b3ca
+_md5_=e131c5a078b490d21de20f73718e105c
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.19.0 b/metadata/md5-cache/dev-ruby/rouge-3.19.0
index e5898c17b2be..8be144a66820 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.19.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.19.0
@@ -5,7 +5,7 @@ DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure
 EAPI=7
 HOMEPAGE=https://github.com/jneen/rouge
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/redcarpet[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.19.0.tar.gz -> rouge-3.19.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fa4250eee0faa0443c51d808957559ab
+_md5_=fc497d013ef7d52f25d21f25c2f84914
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 92602099d4cf..619277e55296 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-luatex-2020-r1 b/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r1
deleted file mode 100644
index f3c3c4b4b844..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=>=dev-texlive/texlive-basic-2020
-DESCRIPTION=TeXLive LuaTeX 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2020 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2020
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-luatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-luatex-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.source-2020.tar.xz )
-_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
-_md5_=8663d73b719f7f8196d24bcd6d2bdd46
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r2 b/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r2
new file mode 100644
index 000000000000..0cf6fd60a745
--- /dev/null
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-fontsrecommended-2020
+DESCRIPTION=TeXLive LuaTeX 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
+RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-fontsrecommended-2020 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2020
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-luatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-luatex-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.source-2020.tar.xz )
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
+_md5_=f787f2ab9eaa93ec8fafb4556b8cc7a1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c9cc08b4d2b9..74abb45537f2 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/anjuta-3.34.0 b/metadata/md5-cache/dev-util/anjuta-3.34.0
index c705a529ae57..597e6f87ac31 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.34.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.34.0
@@ -4,7 +4,7 @@ DESCRIPTION=A versatile IDE for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Anjuta
 IUSE=debug devhelp glade +introspection subversion terminal test vala +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.46 ) ) introspection? ( python_single_target_python2_7? ( >=dev-python/pygobject-3.2:3[python_targets_python2_7(-)] ) ) gnome-base/gsettings-desktop-schemas
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.34/anjuta-3.34.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b95bff55290662314f080afadd173905
+_md5_=bbab0198b6c581a9b7a1c8718f134c24
diff --git a/metadata/md5-cache/dev-util/devhelp-3.34.0 b/metadata/md5-cache/dev-util/devhelp-3.34.0
index bab44a741e28..40e6add0ff7a 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.34.0
+++ b/metadata/md5-cache/dev-util/devhelp-3.34.0
@@ -5,11 +5,11 @@ DESCRIPTION=An API documentation browser for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
 IUSE=gedit gtk-doc +introspection python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.20:4[introspection?] >=gui-libs/amtk-5.0:5 gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-editors/gedit[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-editors/gedit[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-editors/gedit[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_8(-)] ) )
 REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/3.34/devhelp-3.34.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=029fb1ad119e0cf5cdbd91ff9e28efdc
+_md5_=273060b6476240cdc657c2620c95539b
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
index 7aa8cda7a0fb..a2b5c59f888d 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.2
 DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.20/gtk-update-icon-cache-3.24.20.tar.bz2
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d9b9fabdafdead9f156155fec3b1e5e
+_md5_=808a82739d96a132fce9f80bf9877261
diff --git a/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2 b/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2
index 50d7a435bdbe..002978d9c303 100644
--- a/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2
+++ b/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Intel's implementation of the OpenCL standard
 EAPI=5
 HOMEPAGE=https://software.intel.com/en-us/articles/opencl-sdk/
 IUSE=android +system-tbb system-clang +system-boost
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Intel-SDP
 RDEPEND=>=virtual/opencl-3 sys-process/numactl system-tbb? ( >=dev-cpp/tbb-4.2.20131118 ) system-clang? ( =sys-devel/clang-3.4* ) system-boost? ( >=dev-libs/boost-1.52.0:= )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1722db29735195d4a264eb02033b2423
+_md5_=2bd3fc8355e4b84520ad26d693d1f2f9
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.0 b/metadata/md5-cache/dev-util/lldb-10.0.0
index 9923e7da2383..e5edffd83ad6 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.0
+++ b/metadata/md5-cache/dev-util/lldb-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=libedit lzma ncurses +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ~sys-devel/clang-10.0.0[xml] ~sys-devel/llvm-10.0.0 !<sys-devel/llvm-4.0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06c6db461d083e10ebec567d27e7dd4c
+_md5_=c0e9682cf0ddcaf83763f0b7708df51d
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.1_rc2 b/metadata/md5-cache/dev-util/lldb-10.0.1_rc2
new file mode 100644
index 000000000000..ed29c5198937
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-10.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_6? ( ~dev-python/lit-10.0.1_rc2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-10.0.1_rc2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( ~dev-python/lit-10.0.1_rc2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-10.0.1_rc2[python_targets_python3_9(-)] ) sys-devel/lld ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-10.0.1_rc2[xml] ~sys-devel/llvm-10.0.1_rc2 !<sys-devel/llvm-4.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=libedit lzma ncurses +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-10.0.1_rc2[xml] ~sys-devel/llvm-10.0.1_rc2 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=edd526020dedeba660ff1047dfe241c5
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index ac020e3f29a3..d1bf333c15c8 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7 b/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7
index 12a2524dbddd..ae2ea3aa3ee7 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7
@@ -5,11 +5,11 @@ DESCRIPTION=Library with common API for various GNOME modules
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 IUSE=debug gtk-doc +introspection seccomp systemd udev test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes x11-libs/libX11 systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:=[X] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
 RESTRICT=!test? ( test )
 SLOT=3/18
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.34/gnome-desktop-3.34.7.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10cfbbbe78f5ef30728d7868166a66fa
+_md5_=2d894a29e5334c2af2f749b68aacdc3b
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.34.3 b/metadata/md5-cache/gnome-base/nautilus-3.34.3
index 86e4712e0fff..fd8010286b5b 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.34.3
+++ b/metadata/md5-cache/gnome-base/nautilus-3.34.3
@@ -5,7 +5,7 @@ DESCRIPTION=Default file manager for the GNOME desktop
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
 IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+ LGPL-2.1+
 PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
 RDEPEND=>=dev-libs/glib-2.58.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.2.1 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) >=app-misc/tracker-miners-2.0:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.34/nautilus-3.34.3.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f501647aeaa72889874bd6bfd604f001
+_md5_=c8b73124f62e9d1ea0aa9d56199621ea
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 5d59f17200ab..9b9eb2708d71 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.36.3 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.36.3
index a485100b842a..29dad4491c8d 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.36.3
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.36.3
@@ -4,7 +4,7 @@ DESCRIPTION=Evolution groupware backend
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/62-24-20
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.36/evolution-data-server-3.36.3.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=438530324aba159349a300ce420c1a33
+_md5_=479ed29c11777c8eb0d0958a49d6d423
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3 b/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3
index d61e8596e397..18d0a817e3b7 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3
@@ -4,11 +4,11 @@ DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.36.3:0= >=mail-client/evolution-3.36.3:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.36/evolution-ews-3.36.3.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e389908b8018d533b72a6d98274369bf
+_md5_=a67e9857a13ac2016f0da6be107a2406
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0 b/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0
index e8e29b5b5c6c..c21d63f39873 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspecti
 DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.34/gnome-characters-3.34.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4829494b400b58fd6726c8e2a943509e
+_md5_=76a76414747e76b73d7881738edb4c45
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2
index ff9f2193c7b8..0e14dcc798d5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2
+++ b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2
@@ -3,11 +3,11 @@ DEPEND=dev-util/itstool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev
 DESCRIPTION=Help a new user get started in GNOME
 EAPI=6
 HOMEPAGE=https://help.gnome.org/
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=gnome-extra/gnome-user-docs
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.34/gnome-getting-started-docs-3.34.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79aeec7953b4f3f5bb11c09134be3370
+_md5_=bff3552aa434730f3d14083e9e75d0a0
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
index 0ac5fe8049b7..5df04d51e5f5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=Moves legacy tray icons to top panel
 EAPI=7
 HOMEPAGE=https://extensions.gnome.org/extension/1031/topicons/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.34
 SLOT=0
 SRC_URI=https://github.com/phocean/TopIcons-plus/archive/27.tar.gz -> gnome-shell-extensions-topicons-plus-27.tar.gz
-_md5_=ea6673a659d0e55dc5216920132ca00f
+_md5_=783d41e01397962b5a1cf254dd4d9de3
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2
index 4ca6029e7aaf..e4144e9b30be 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME end user documentation
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-docs/3.34/gnome-user-docs-3.34.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cd80ff9d25e048b82433ddc7d6cba6f
+_md5_=d16526a831e51cc8f8cb3f6e53d5cfc2
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 6809b824ec4f..e57af2c3ccc3 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/evolution-3.36.3 b/metadata/md5-cache/mail-client/evolution-3.36.3
index ddcdf64ab503..6b4295789e00 100644
--- a/metadata/md5-cache/mail-client/evolution-3.36.3
+++ b/metadata/md5-cache/mail-client/evolution-3.36.3
@@ -4,10 +4,10 @@ DESCRIPTION=Integrated mail, addressbook and calendaring functionality
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.36.3:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.24.0:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.36/evolution-3.36.3.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0aabfeac256b6f0637b4526f8621cc35
+_md5_=d476079166c41e1bdbcbd656e78a06c9
diff --git a/metadata/md5-cache/mail-client/neomutt-20200313 b/metadata/md5-cache/mail-client/neomutt-20200313
deleted file mode 100644
index 24baa5a86d29..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20200313
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://neomutt.org/
-IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/20200313.tar.gz -> neomutt-20200313.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b302f33bd90d6f1da3e348649ccb2a11
diff --git a/metadata/md5-cache/mail-client/neomutt-20200320 b/metadata/md5-cache/mail-client/neomutt-20200320
deleted file mode 100644
index 618e362ebfd3..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20200320
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://neomutt.org/
-IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/20200320.tar.gz -> neomutt-20200320.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b302f33bd90d6f1da3e348649ccb2a11
diff --git a/metadata/md5-cache/mail-client/neomutt-20200424 b/metadata/md5-cache/mail-client/neomutt-20200424
deleted file mode 100644
index b079157663c6..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20200424
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://neomutt.org/
-IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/20200424.tar.gz -> neomutt-20200424.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87280acf8f1418f13e4fd37b373657a2
diff --git a/metadata/md5-cache/mail-client/neomutt-20200417 b/metadata/md5-cache/mail-client/neomutt-20200626
similarity index 95%
rename from metadata/md5-cache/mail-client/neomutt-20200417
rename to metadata/md5-cache/mail-client/neomutt-20200626
index b107d2e2c961..e01c8144da64 100644
--- a/metadata/md5-cache/mail-client/neomutt-20200417
+++ b/metadata/md5-cache/mail-client/neomutt-20200626
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/20200417.tar.gz -> neomutt-20200417.tar.gz
+SRC_URI=https://github.com/neomutt/neomutt/archive/20200626.tar.gz -> neomutt-20200626.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87280acf8f1418f13e4fd37b373657a2
diff --git a/metadata/md5-cache/mail-client/trojita-0.7-r2 b/metadata/md5-cache/mail-client/trojita-0.7-r2
deleted file mode 100644
index e51815ac50c1..000000000000
--- a/metadata/md5-cache/mail-client/trojita-0.7-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 zlib? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A Qt IMAP e-mail client
-EAPI=7
-HOMEPAGE=http://trojita.flaska.net/
-IUSE=+crypt +dbus debug +password test +zlib test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=password? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/trojita/trojita-0.7.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=447cdeab82ea6553ad95feb70c62115a
diff --git a/metadata/md5-cache/mail-client/trojita-0.7-r4 b/metadata/md5-cache/mail-client/trojita-0.7-r4
index 43b4a87cb70e..7d386d741e70 100644
--- a/metadata/md5-cache/mail-client/trojita-0.7-r4
+++ b/metadata/md5-cache/mail-client/trojita-0.7-r4
@@ -5,7 +5,7 @@ DESCRIPTION=A Qt IMAP e-mail client
 EAPI=7
 HOMEPAGE=http://trojita.flaska.net/
 IUSE=+crypt +dbus debug +password test +zlib test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=password? ( dbus )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/trojita/trojita-0.7.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5838175cb7cffcaa9073cb45c43b8916
+_md5_=0af78120977e3b98ae6f7c2fccba4adf
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 11c75a23600b..38ed4beb06bd 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.5.4 b/metadata/md5-cache/mail-mta/postfix-3.5.4
new file mode 100644
index 000000000000..a364708b8f38
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.5.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=>=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=>=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) acct-group/postfix acct-group/postdrop acct-user/postfix 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.5.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=94a004f079361718518bb771e449f421
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200620 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200627
similarity index 98%
rename from metadata/md5-cache/mail-mta/postfix-3.6_pre20200620
rename to metadata/md5-cache/mail-mta/postfix-3.6_pre20200627
index 44d3473279ab..29f9f1b51dc5 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200620
+++ b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200627
@@ -10,6 +10,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=>=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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) acct-group/postfix acct-group/postdrop acct-user/postfix 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/experimental/postfix-3.6-20200620.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20200627.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b75a70c173ba8be311dcb621a4bb270
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 78d7700bc9a6..4d4aa248eba8 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/scrot-9999 b/metadata/md5-cache/media-gfx/scrot-9999
index 444aa66a334b..84c49d566ce3 100644
--- a/metadata/md5-cache/media-gfx/scrot-9999
+++ b/metadata/md5-cache/media-gfx/scrot-9999
@@ -1,12 +1,12 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install prepare unpack
-DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] ) x11-base/xorg-proto
+DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] ) x11-base/xorg-proto
 DESCRIPTION=Screen capture utility using imlib2 library
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
 LICENSE=feh LGPL-2+
 PROPERTIES=live
-RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
+RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=511553a518953e97870d356da50ee929
+_md5_=fc6d568f66f293946e6ec5e40963d9fd
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.9 b/metadata/md5-cache/media-gfx/shotwell-0.30.9
index cadd93fee142..159d6610aad0 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.30.9
+++ b/metadata/md5-cache/media-gfx/shotwell-0.30.9
@@ -5,10 +5,10 @@ DESCRIPTION=Open source photo manager for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
 IUSE=opencv udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.9.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=022c71e61936dfb2d8f9598fc68df1ea
+_md5_=1d7796f03f151ed4270d4e19f1a4ddae
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.34.6 b/metadata/md5-cache/media-gfx/simple-scan-3.34.6
index fe94b48cee3b..36cc6ee61440 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.34.6
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.34.6
@@ -5,10 +5,10 @@ DESCRIPTION=Simple document scanning utility
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/simple-scan
 IUSE=colord webp
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://gnome/sources/simple-scan/3.34/simple-scan-3.34.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=240ed8b048c2f9c5f47456a978ed702b
+_md5_=92401a1c2d94e7cc950a08c45b10360c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8329268bae5b..477c23549928 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/graphene-1.10.0 b/metadata/md5-cache/media-libs/graphene-1.10.0
index 7b933a9e3921..4bf067fa41af 100644
--- a/metadata/md5-cache/media-libs/graphene-1.10.0
+++ b/metadata/md5-cache/media-libs/graphene-1.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=A thin layer of types for graphic libraries
 EAPI=7
 HOMEPAGE=https://ebassi.github.io/graphene/
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.10.0/graphene-1.10.0.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57575a2b2b3922d0b2a69a7ed989ac49
+_md5_=5d614849d5717738f7913ef3619e90a0
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.12 b/metadata/md5-cache/media-libs/grilo-0.3.12
index 040152494e97..a3b1da5c90b1 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.12
+++ b/metadata/md5-cache/media-libs/grilo-0.3.12
@@ -5,7 +5,7 @@ DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=gtk gtk-doc +introspection +network +playlist test vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gtk? ( net-libs/liboauth >=x11-libs/gtk+-3.14:3 )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.12.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4476cc24def4cbbbf34cf70947052317
+_md5_=79ff09428150b510355de05652eb9617
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
index a316203adf3e..fffebaf0873c 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=X bzip2 +introspection +orc vnc wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls test
-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=LGPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.15 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7aead323f7595abc26f45969a801f206
+_md5_=a6dae192f91b1570cfd498c1163246b1
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
index a986853e26b7..c3202acbac57 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9dacfb623ba0ce19d4ba8ca9f3b5acc
+_md5_=1fe6e65b895b68ebbea2fb1cbe395980
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2
index cff8f559dc0f..8b3784eaa343 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-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=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e1fa084f93b56683fae6e6f9fdefa6e
+_md5_=81358b32da5556619df0dc0fbdf40fd0
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2
index 8203a01b86e1..8d10ad2aa711 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-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+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ed77d1420a7da8962ba97190b5aca49
+_md5_=644ed12972d4e14d711a51a055d97599
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.16.2 b/metadata/md5-cache/media-libs/gstreamer-1.16.2
index 0e18fcd24794..2695dfb48ee2 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.16.2
+++ b/metadata/md5-cache/media-libs/gstreamer-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Open source multimedia framework
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.16.2.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=febf3ab1a3398791c02c1ae8e03f3ce9
+_md5_=16d8efd89a4326f5a5321b9e133f2afb
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.7 b/metadata/md5-cache/media-libs/harfbuzz-2.6.7
index 376eb5981f75..92a58a601888 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.6.7
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.7
@@ -5,7 +5,7 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/2.6.7/harfbuzz-2.6.7.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e50b41d6a88e11d1f4b6b19d6fb76fd
+_md5_=948952c50e1432475528d90cc6ac368d
diff --git a/metadata/md5-cache/media-libs/jpeg-9d b/metadata/md5-cache/media-libs/jpeg-9d
index 300f0d128fce..dc6facc11e43 100644
--- a/metadata/md5-cache/media-libs/jpeg-9d
+++ b/metadata/md5-cache/media-libs/jpeg-9d
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=6
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9d.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=49af9be659cee721cbc453eb9a0fd2a2
+_md5_=1c80f1c922fbd76230b40087193e58c2
diff --git a/metadata/md5-cache/media-libs/libcddb-1.3.2-r1 b/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
index 172122125a37..5158e13964e2 100644
--- a/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
+++ b/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
@@ -1,14 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815
 DESCRIPTION=A library for accessing a CDDB server
-EAPI=5
+EAPI=7
 HOMEPAGE=http://libcddb.sourceforge.net/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
-RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libcddb/libcddb-1.3.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1699d01508a5f1fc9493a1677b4a678e
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4b42e14a695fe3787265cbbf6f0ffbca
diff --git a/metadata/md5-cache/media-libs/woff2-1.0.2-r2 b/metadata/md5-cache/media-libs/woff2-1.0.2-r2
index 4a4b3094ae50..80ad6f19cc95 100644
--- a/metadata/md5-cache/media-libs/woff2-1.0.2-r2
+++ b/metadata/md5-cache/media-libs/woff2-1.0.2-r2
@@ -4,10 +4,10 @@ DEPEND=app-arch/brotli
 DESCRIPTION=Encode/decode WOFF2 font format
 EAPI=7
 HOMEPAGE=https://github.com/google/woff2
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli
 SLOT=0
 SRC_URI=https://github.com/google/woff2/archive/v1.0.2.tar.gz -> woff2-1.0.2.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49b394b386d60d7ea2baa97fe718d380
+_md5_=8af57bf09a75b70aab99f937d74bca6e
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index d2a07cb57f5c..c48d53f6a7b2 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.11 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.11
index 9bb9bac919ea..79fa6656b957 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.11
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.11
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of plugins for the Grilo framework
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.8:0.3=[network,playlist] freebox? ( net-dns/avahi[dbus] ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-2.3.0:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
 RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.11.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98c9bb7fbd1efb4f14a847dfb4c90eb8
+_md5_=51091e0df1b436523a4b79827712e7c6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2
index f3117eb782f4..008278defd18 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=ATSC A/52 audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd51ab1c17131b8ec2627e0a2fd3831b
+_md5_=f6390498b23ebb822fb1a0a4099d709e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2
index 469b1d6f19a0..e22129bfacc5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2b0ff7286954784c3c094b996677d73
+_md5_=5a76d140542b6086f50684be4cca6239
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2
index 5e6b87a5b9b7..37d6cedb7080 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcc7e95a6e70c0e2184a2d981b550744
+_md5_=073a6958d3fc7305404229e58d841e17
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2
index fd96008ad450..d4ec2e5a282d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AVDTP source/sink and A2DP sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=914ea75f69dff937184b1a0c6cc67046
+_md5_=e0081a0b3405da63a28f6a22c55ea226
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2
index 8e02f572f237..74a147266a16 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=bs2b elements for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b544f5795fed23a6bda213d474bee4d7
+_md5_=f357b4531744a0e1d59012e69c4fcf3c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.16.2
index ce23440175ae..fbb25e089534 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Video overlay plugin based on cairo for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e86bfcc35a68af99443479ee1dc1a23
+_md5_=9aad30aef174662bfd8beb2959ff4e84
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2
index 7bd3f8a788cc..f59c6283c5fa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48085b77d63b2861f3ac320117888b80
+_md5_=ab223d4a78291c91fb1e208489c53274
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2
index 017e482403f3..34e667d63529 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0462938afef1aad3f7417f5777e8ffcf
+_md5_=476a66e621981fbf567dad7bca487846
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2
index 2db01d99b16a..89b80c05f0cc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG-DASH plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7968480a67e83f8484266fbf56a494bc
+_md5_=a753a85047b1aff49bff6fd0f71e085f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2
index 28ad2a666189..bbb84e80a599 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DTLS encoder/decoder with SRTP support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3151c8e2f786de2c42a9f8dd9407780
+_md5_=4f39b6d0fb42e63f09ce3ee7fc1114e1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2
index 9c19a5750837..8a19672c76ab 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DTS audio decoder plugin for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3696eb7d4348693e903183ca93931818
+_md5_=1d4ebaa3f5e0a450218fd1489bb7f69c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2
index 7ad1654c3dde..e11162bdca06 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DV demuxer and decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=354ea17e91436321da152407f0bbb596
+_md5_=fddd8b154f2a62929eef41aca56ce4d9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2
index 2c08795b2711..cd0d337d1f94 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8653a022cde9096e55a911af67e978ab
+_md5_=9f71d03f6833ac3083609825977c3915
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2
index 272ec286b967..8b12af160e99 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DVD read plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1c91b443e5ad21af1b8000a0cee22ab
+_md5_=fa94df508c82a31500e65958c695faad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2
index 28592110425f..76f134235197 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6198e9dd1d06e3afc343f95a73922a1f
+_md5_=7dfffef04c7bb68dea9ec4b3baf665ec
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2
index 3d0677d783ab..b0a27a1b0fbc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio decoder plugin.
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fcbee0be5438e54218ba86b130dcbf76
+_md5_=b3bdee439854765193ba15e901f9b141
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2
index ade9b3be999c..5a36e9b0236f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=FLAC encoder/decoder/tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81176fe6d9ae3012ac9dd21af995b7f3
+_md5_=dd06a37f85fe449dc09b28789eb77226
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2
index da92c2de4911..890c412909c5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d29134adc00fbbb334475c03399a23e
+_md5_=1903a59793ac36ec2d70e036a4738d73
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2
index f36689cbaf62..6c9f2fcc4260 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Video sink plugin for GStreamer that renders to a GtkWidget
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c45da6703fd8f5623bc349032bdb652
+_md5_=6a751bfe9bdd9c64c15fa35317232b98
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2
index 27f6fb0fe651..421172993dc6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP live streaming plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2cc1dc115b160209af933813aabdfc4c
+_md5_=5b64e3cbc51b450c8551f414bb892c3f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
index 6530f8cec8cf..280e09015deb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88a3db500d8534e7618b69a7188d06fe
+_md5_=0b5aa5cd2fa1fc6e19be7660a068d3bd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2
index ea1f3fc9c435..17e531d691d5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=JPEG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27da8473ac90f55589cb9128e207328d
+_md5_=1d2c5e615f4f4d4d29c780270e18dbf9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2
index 120b429144b0..86e72caaa006 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Ladspa elements for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12ff8d0314259174c26f52d2a3ceb460
+_md5_=09d18dfc3fb5efc15a2695bb437a2db9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2
index c51fab8b6600..581d0d7ad1c0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8014cd34851e544ccca18267c4d811c
+_md5_=f3f1a21881d43e3e17b463b9520c3ce5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1
index 0d92edce6146..68783aa18271 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f1903ec25da8922a19dedd4051a4796
+_md5_=111570386445047ce09d3eebd829f6b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2
index 60055e8e64e1..61f296498f85 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.265 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef36f20461a74a2ce99d740beee8d6b1
+_md5_=b619841e887eb16d29ede1fa1323184d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2
index ebabb8ab1fff..ea84496d8ae7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e30e153a3cb03caab0b8ea336003c5f
+_md5_=2ce7a06db3d78cf280254c2ef1739928
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2
index 482961cc8497..376793dd903c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=PNG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e58d3d496c35406f001399c75920a3b
+_md5_=60f7fd9b1cededd0b7c47c6a135b7e70
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2
index 58a6a81fc333..0b13e6d55212 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Visualization elements for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f3ea3d154143a1411cfd7db04968b8e
+_md5_=24e91ece1c3d737e1a3eaa8693165453
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
index bc1c87fb576d..5404b620d87f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Lv2 elements for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2066874172a68e83a8956a7359eb254e
+_md5_=5096de9b605ffa44cbf6c57db7fdd7bd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2
index ead384482115..c5b8eee37cb5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=metapackage
 RDEPEND=>=media-libs/gstreamer-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[alsa?,ogg?,theora?,vorbis?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-cdio-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-a52dec-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-dvdread-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-resindvd-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpg123-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3ff1015e2bfde97cbeb4fa08839b6277
+_md5_=939a7f1bd43bfdf1fc30b2dbf940e341
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2
index e74b3c44ea2e..c5aa8eeeb5f9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MOD audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm64 ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4246c089066820958e2d8f7c5824b658
+_md5_=134330e90f99ff4a79056f2f028a5f75
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2
index a5d798e79391..c980549177ba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25489dd9b65450847f6aff3ddf188287
+_md5_=2d1d9b5976c974faae2d7ac4de033f0c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2
index b15d708f1313..eb3f218b2bf5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG-1/2 video encoding plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d5a86ea927bfb41daed61e77f9d43e3
+_md5_=327c2f6a5dbc129d384c1213a11b3d03
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2
index cf2872071d1d..3b72fe6db98c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=343b83fe5e5ce5fb3d98f3c4c84b8ac6
+_md5_=af95ccd4764449d23a15851967d5ca51
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2
index e44d076de0ae..c6df00d53c15 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=546d6c8893595a791ca00b61d272abff
+_md5_=6e3a0420d94b49b6e42d0b90444fac4e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2
index 191b1e5eec1a..73f563babe58 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63ad27f33d934e4f34d3603d1495c6c9
+_md5_=98492bebabfbf8b84711c3a720b3c8a7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2
index 4960613030f6..b23ee4511bba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MusicIP audio fingerprinting plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99f626a2a8acac88c349bfcdc547e977
+_md5_=f8969963f8355cc887a527d26039c76d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2
index 4afb9b1da0fc..b9d63f0e9e20 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder/decoder plugin for GStreamer.
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5513ba5842d0cea0a1d36bbd292360d9
+_md5_=0f59e14a42d2926713261d12a1321198
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2
index 3c0772811839..63f232ce3f0f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Opus audio parser plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,ogg] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce594d0ea46fef7b4e93de961d65b0fc
+_md5_=24629c9ee8da8682ec1dcf61a75bb75d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2
index f2ae12f02936..d657b1ae4134 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=OSS (Open Sound System) support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3434837037ad74ea42e8495d5ea897bd
+_md5_=4b6274688bad68a67d893290ec58ad50
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2
index 24d7493a23ba..7ce3cbfe38e9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=PulseAudio sound server plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=050a9132b8b6cba0fe74a57d907c53ea
+_md5_=b28790ad360e6bfb7962a67d9e21d5ae
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2
index eff0547cb501..c2fdaf5b127b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Fiwewire DV/HDV capture plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a2a35f2c731881b5e053548b516189b
+_md5_=e887357d599539f2f6bd167cb1282012
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2
index 9aa5a762381f..da1d32473c0c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DVD playback support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/libdvdnav-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e6e7061f08d6b4879c65032394fcbab
+_md5_=03cba1d3f5403e54a0b549d0d1fef7e3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2
index 2bc0003c87ca..e60a48f0581b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=RTMP source/sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76732a1388114f4ea1bbd29c0280ff8a
+_md5_=2efe1b6a1fa6ece34143deac5bc671f7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2
index 098fb9239573..e0f27520f88a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Icecast server sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d832c1095340f06bd404aeada7711c80
+_md5_=cf8e026484b3a8f75d611e37a291982a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2
index 2956052ecdc2..b6aa106c0ce6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Sid decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d502c371399556713a68d2b4ae63216
+_md5_=1ac6d9f7bab68d484611c61c8b466b45
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2
index 8a3e9792b865..278ebcf54005 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Smooth Streaming plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e47d7494d543b471623cf96ab76cbbb
+_md5_=eec5fa6819b4b298a27c2e0e8f0d3049
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2
index f70ec2a851f3..ef0e259fa8fb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Beats-per-minute detection and pitch controlling plugin for GStreame
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28d90d82e248266369088258db8b548b
+_md5_=0efcf7e4df5e500591f5c7e0015b9e30
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2
index 40944f0df523..ccb528c643ef 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source/sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a15a12f60b189cf7db55348a53610f60
+_md5_=08e85a288d331c1f625b68a82ea49fee
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2
index 805a52f8550f..fe13788f159d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Speex encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d4afcf88231e4350a504f554049b166
+_md5_=3bfb04a5a0e557cc4deee96e2a32f51b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2
index e4ce687fcb60..2e41e35cd5de 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=SRTP encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99fe1106c511195242cda13ad4a26494
+_md5_=98c25087f5446e492723d2bf752e9618
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2
index 18b82bea78cd..f6f8073e1245 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=ID3v2/APEv2 tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b93752f0110fc98d83f7194eaa7820cf
+_md5_=8d365b20a064047f001667706e4565e5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2
index 88f8bc06751c..ca4beb27ea4a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cf836c404ebad5b44780ae62dc66bf6
+_md5_=b95f230c7835a73f922b362b41b49ca0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2
index 2bbb48d682a2..eb46b1b73f65 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=UVC compliant H264 encoding cameras plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9715f1391b2586c150dd8dd1b80f892e
+_md5_=ef958c44d28e49cc64d309890b99540f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2
index 1d109ff85052..6d1a49dc852d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=dev-libs/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2a6e5d530a73c58a3c6fd44a6165a95
+_md5_=509d0fe78a769186c937cd389545f566
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2
index 5e14aa7316f8..4aa38e8c2f6e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStrea
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi
 IUSE=+drm +egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.16.2:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.16.2:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.15 ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( drm gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.16.2.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a8061527a4373664a53d584c0cbc2b9b
+_md5_=fa6442f5a8c68f2d92387e99e14c4a23
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2
index 16626fefb98c..226ad8016bde 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AAC encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=695249040951ea466b07296591923354
+_md5_=3be1ba14d22659a566b0b161dabefca8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2
index ed3879c48325..28b40f6b4aea 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AMR-WB audio encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f2ce82105c447019aa3cdc2fcc14213
+_md5_=228ceb4b3d1b3280a821ae8eb16205a6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2
index 27d1df51aa5f..469d0276e7f9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=VP8/VP9 video encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db5db4be3a977380e392aa528472c644
+_md5_=2e981a88f4bedafdc09bf474f4b616ec
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2
index 328e33b1f20a..6a83e5d03c8e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Wavpack audio encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e3763c1d2a0135a5ea777930ac0e256
+_md5_=f7dbdeb2dffa01c145194cedddf34d92
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2
index b61793b1abc7..b54c3e403c2b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c26d2b6bcd34cd2016390548bda7516
+_md5_=f4ae46fb0d346bc4e826a41c60772e0b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2
index eae987ee1690..98ebb90b8688 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.265 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=439102280dd4d4386a478a61979c2361
+_md5_=83f4bba6e3714282d0e63c5df662eddf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2
index 3295b676e0df..eab4a3030b41 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=X11 video capture stream plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba7e2db6b26d42253ba99a8740713c9f
+_md5_=602e84aa644274834d90b27bbca42b71
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 10cc63feb845..fe9638d648f4 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/gnome-music-3.34.6 b/metadata/md5-cache/media-sound/gnome-music-3.34.6
index 21024a37e5f1..4946b1ef210b 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.34.6
+++ b/metadata/md5-cache/media-sound/gnome-music-3.34.6
@@ -5,7 +5,7 @@ DESCRIPTION=Music management for Gnome
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Music
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.50:2 net-libs/gnome-online-accounts[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.24.7:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] >=app-misc/tracker-2.2.0:=[introspection(+)] python_single_target_python3_6? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_6(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_7(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_8(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_8(-)] ) >=media-libs/grilo-0.3.9:0.3[introspection] >=media-plugins/grilo-plugins-0.3.9:0.3 || ( >=app-misc/tracker-miners-2.2.0[gstreamer] >=app-misc/tracker-miners-2.2.0[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.34/gnome-music-3.34.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b129d0179e55fc8d29d2d51be84a54b5
+_md5_=b9bf2173e9e80025886c554396763142
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 94f548e29d9a..27540e20cb78 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r1 b/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r1
deleted file mode 100644
index a60907de28ea..000000000000
--- a/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=VDR: genindex Script
-EAPI=4
-HOMEPAGE=http://www.cadsoft.de/vdr/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.muempf.de/down/genindex-0.1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=591fbedc8dde90ab62f9c9ce34489161
diff --git a/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2 b/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
index 3f9d6aa5a215..d27dfb66c6e1 100644
--- a/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
+++ b/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=VDR: genindex Script
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.muempf.de/down/genindex-0.1.3.tar.gz
-_md5_=47ad2cca78d8ba8d448dbf1c57abdca8
+_md5_=6452a32c87c40e3657033c7e33686ed5
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index f3ff15c2c075..ecbefbd59de7 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.14 b/metadata/md5-cache/net-analyzer/etherape-0.9.14
deleted file mode 100644
index aeaca3cf1294..000000000000
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap >=sys-devel/gettext-0.11.5 app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A graphical network monitor for Unix modeled after etherman
-EAPI=6
-HOMEPAGE=http://etherape.sourceforge.net/
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/etherape/etherape-0.9.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57222c87f471c05c0f2db89fd85282eb
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.18 b/metadata/md5-cache/net-analyzer/etherape-0.9.18
deleted file mode 100644
index 43f3f0b8e063..000000000000
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0 >=sys-devel/gettext-0.11.5 app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools virtual/pkgconfig
-DESCRIPTION=A graphical network monitor for Unix modeled after etherman
-EAPI=6
-HOMEPAGE=http://etherape.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/etherape/etherape-0.9.18.tar.gz
-_md5_=5a37dae41cdf8ff4e8ed0ee3c8ff6e70
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.19 b/metadata/md5-cache/net-analyzer/etherape-0.9.19
index b6a564c010d0..7f421b776960 100644
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.19
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.19
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0 >=s
 DESCRIPTION=A graphical network monitor for Unix modeled after etherman
 EAPI=7
 HOMEPAGE=https://etherape.sourceforge.io/
-KEYWORDS=amd64 ppc ppc64 sparc ~x86
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/etherape/etherape-0.9.19.tar.gz
-_md5_=c115db4c1c8a70e5307e68c80b5da673
+_md5_=8ce5c7a4f8399f227fee31506621f778
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index f9d952870e54..6b9c45fd85eb 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-9.16.4 b/metadata/md5-cache/net-dns/bind-9.16.4
new file mode 100644
index 000000000000..8be1c98278ac
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.4
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc
+REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.4/bind-9.16.4.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=9de94672a85c3a5311b9efd02a274ce8
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.4 b/metadata/md5-cache/net-dns/bind-tools-9.16.4
new file mode 100644
index 000000000000..ab46ac7103fc
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.4/bind-9.16.4.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=63058fc13ffe94e4bc850ed18aa9b2d9
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 1bf5af7c5a25..571bc5b4e856 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.5.1 b/metadata/md5-cache/net-firewall/shorewall-5.2.5.1
index 7eac0c536ffc..711addfebb0f 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.5.1
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=7
 HOMEPAGE=https://shorewall.org/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
 SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-core-5.2.5.1.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-5.2.5.1.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-5.2.5.1.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-lite-5.2.5.1.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-lite-5.2.5.1.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-init-5.2.5.1.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-docs-html-5.2.5.1.tar.bz2 )
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e4c8c77c1edf6f4a7be7f6da92c8930
+_md5_=af4710824c375e3dbce2ad7a31c89af3
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.5 b/metadata/md5-cache/net-firewall/shorewall-5.2.5.2
similarity index 63%
rename from metadata/md5-cache/net-firewall/shorewall-5.2.5
rename to metadata/md5-cache/net-firewall/shorewall-5.2.5.2
index f5da3bb0a1de..31a28a25c7f1 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.5
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=7
 HOMEPAGE=https://shorewall.org/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
-KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
-SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-core-5.2.5.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-5.2.5.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-5.2.5.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-lite-5.2.5.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-lite-5.2.5.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-init-5.2.5.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-docs-html-5.2.5.tar.bz2 )
+SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-core-5.2.5.2.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-5.2.5.2.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-5.2.5.2.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-lite-5.2.5.2.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-lite-5.2.5.2.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-init-5.2.5.2.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-docs-html-5.2.5.2.tar.bz2 )
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af4710824c375e3dbce2ad7a31c89af3
+_md5_=1e4c8c77c1edf6f4a7be7f6da92c8930
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index d8b4a8186c31..ab1807637bd6 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/polari-3.34.1 b/metadata/md5-cache/net-irc/polari-3.34.1
index 45419cae2c71..1e9ba315ee45 100644
--- a/metadata/md5-cache/net-irc/polari-3.34.1
+++ b/metadata/md5-cache/net-irc/polari-3.34.1
@@ -5,11 +5,11 @@ DESCRIPTION=An IRC client for Gnome
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Polari
 IUSE=test
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.57.3 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.34/polari-3.34.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65f443839fcbbff2ae10843268278acf
+_md5_=e73ee964efaafaaceaa5bcf10e612650
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 8b1a8f25290c..d00b363f83b7 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/cppzmq-4.6.0 b/metadata/md5-cache/net-libs/cppzmq-4.6.0
index 2da7988e99aa..354edc13270f 100644
--- a/metadata/md5-cache/net-libs/cppzmq-4.6.0
+++ b/metadata/md5-cache/net-libs/cppzmq-4.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=High-level CPP Binding for ZeroMQ
 EAPI=7
 HOMEPAGE=https://github.com/zeromq/cppzmq
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=>=net-libs/zeromq-4.3.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/cppzmq/archive/v4.6.0.tar.gz -> cppzmq-4.6.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=668cf42536e6f91e3e15a4a89d799423
+_md5_=1f85d28fb5632fbf1c545b3073bdab9f
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-1.0.0 b/metadata/md5-cache/net-libs/gtk-vnc-1.0.0
index 54c29f1879a9..e3a4ebfc1679 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-1.0.0
+++ b/metadata/md5-cache/net-libs/gtk-vnc-1.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=VNC viewer widget for GTK
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/gtk-vnc
 IUSE=+introspection pulseaudio sasl +vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gdk-pixbuf-2.12.0:2 >=dev-libs/libgcrypt-1.5.0:0= >=net-libs/gnutls-3.1.18:0= >=sys-libs/zlib-1.2.5 sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) >=x11-libs/gtk+-3.0.0:3[introspection?] >=x11-libs/cairo-1.2.0 >=x11-libs/libX11-1.6.5 pulseaudio? ( >=media-sound/pulseaudio-10.0 ) introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk-vnc-1.0.0-patchset.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39280961a7d70c8bc7c22f31a677cd57
+_md5_=5cb2c6bf3f4e895f84fef098b1b5365b
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.12-r5 b/metadata/md5-cache/net-libs/libvncserver-0.9.12-r5
deleted file mode 100644
index 06114f6423b7..000000000000
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.12-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) lzo? ( dev-libs/lzo ) png? ( >=media-libs/libpng-1.6.10:0= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
-DESCRIPTION=library for creating vnc servers
-EAPI=7
-HOMEPAGE=https://libvnc.github.io/
-IUSE=+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+ BSD MIT
-RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) lzo? ( dev-libs/lzo ) png? ( >=media-libs/libpng-1.6.10:0= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
-REQUIRED_USE=jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )
-SLOT=0
-SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.12.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=580c7cdcc86ffe10ceaf05fb120e2e47
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.13 b/metadata/md5-cache/net-libs/libvncserver-0.9.13
index b68a38cf77d6..94490a33d20f 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.13
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.13
@@ -5,11 +5,11 @@ DESCRIPTION=library for creating vnc servers
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+ BSD MIT
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) lzo? ( dev-libs/lzo ) png? ( >=media-libs/libpng-1.6.10:0= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
 REQUIRED_USE=filetransfer? ( threads ) jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05e526deb5a742e2ab55ecc152dbe998
+_md5_=a63f1392deaa7f808e9cdad232e9d7fe
diff --git a/metadata/md5-cache/net-libs/signond-8.60-r2 b/metadata/md5-cache/net-libs/signond-8.60-r2
index edde7296a0c2..eb9631b90150 100644
--- a/metadata/md5-cache/net-libs/signond-8.60-r2
+++ b/metadata/md5-cache/net-libs/signond-8.60-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Signon daemon for libaccounts-glib
 EAPI=7
 HOMEPAGE=https://gitlab.com/accounts-sso
 IUSE=doc test
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 net-libs/libproxy
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/signond/-/archive/VERSION_8.60/signond-VERSION_8.60.tar.gz -> signond-8.60.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c56945a3e707de07120fa6aa3d72e6db
+_md5_=dc281e16429a423c10a48bfc356e247c
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index cce02f6c5a91..a3ea40440b1e 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/bridge-utils-1.6 b/metadata/md5-cache/net-misc/bridge-utils-1.6
index ab2569bfb4ac..e35a6c042bbc 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.6
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for configuring the Linux kernel 802.1d Ethernet Bridge
 EAPI=6
 HOMEPAGE=http://bridge.sourceforge.net/
 IUSE=selinux kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.6.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aa3bcdb68a5088aa3e411ccd7358ff67
+_md5_=2f5f08e8224a3a0229e28f5804251b31
diff --git a/metadata/md5-cache/net-misc/curl-7.71.0 b/metadata/md5-cache/net-misc/curl-7.71.0
index 82a525cdf5e5..fa3e7a7b2645 100644
--- a/metadata/md5-cache/net-misc/curl-7.71.0
+++ b/metadata/md5-cache/net-misc/curl-7.71.0
@@ -5,7 +5,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.71.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e813d0fd60fa89cc6d9a784dbd93068
+_md5_=7f416a0ce9bc92380956118d6db38a1d
diff --git a/metadata/md5-cache/net-misc/etherdfs-20180203-r1 b/metadata/md5-cache/net-misc/etherdfs-20180203-r1
index 2680405faf43..96aea1730e5e 100644
--- a/metadata/md5-cache/net-misc/etherdfs-20180203-r1
+++ b/metadata/md5-cache/net-misc/etherdfs-20180203-r1
@@ -4,9 +4,9 @@ DESCRIPTION=An ethernet-based file system for DOS
 EAPI=7
 HOMEPAGE=http://etherdfs.sourceforge.net/
 IUSE=tsr
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/etherdfs/ethersrv-linux-20180203.tar.xz tsr? ( mirror://sourceforge/etherdfs/v0.8.2/etherdfs.zip -> etherdfs-20180203.zip )
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=09432deb9073b522d753b24118b3dd05
+_md5_=02d2b3733a70235b9e2b2e757c88cc09
diff --git a/metadata/md5-cache/net-misc/kea-1.7.7 b/metadata/md5-cache/net-misc/kea-1.7.9
similarity index 89%
rename from metadata/md5-cache/net-misc/kea-1.7.7
rename to metadata/md5-cache/net-misc/kea-1.7.9
index 45aa6fbcb732..44d1d4735d05 100644
--- a/metadata/md5-cache/net-misc/kea-1.7.7
+++ b/metadata/md5-cache/net-misc/kea-1.7.9
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) acct-group/dhcp acct-user/dhcp
 SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.7.7.tar.gz ftp://ftp.isc.org/isc/kea/1.7.7/kea-1.7.7.tar.gz
+SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.7.9.tar.gz ftp://ftp.isc.org/isc/kea/1.7.9/kea-1.7.9.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=68145fb24e7cdb912b4a723827d37047
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.2_pre1 b/metadata/md5-cache/net-misc/rsync-3.2.2_pre2
similarity index 99%
rename from metadata/md5-cache/net-misc/rsync-3.2.2_pre1
rename to metadata/md5-cache/net-misc/rsync-3.2.2_pre2
index b352967535c4..ba81b492038d 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.2_pre1
+++ b/metadata/md5-cache/net-misc/rsync-3.2.2_pre2
@@ -8,6 +8,6 @@ IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr x
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.2pre1.tar.gz
+SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.2pre2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6bc22331739a51ac68e663d3881ce0df
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
index 33feda053d92..37d4b32a1181 100644
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ b/metadata/md5-cache/net-misc/usbip-3.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ef6475c3ed503ae0a53603cce65532c5
diff --git a/metadata/md5-cache/net-misc/usbip-4.13 b/metadata/md5-cache/net-misc/usbip-4.13
index 14a7765def4f..59f1b21ca47e 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13
+++ b/metadata/md5-cache/net-misc/usbip-4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=37ba62a20e3cdefca00a73f5f7ff4c0f
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 79a33c839c81..c51529f23b6b 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/nsscache-0.30 b/metadata/md5-cache/net-nds/nsscache-0.30
deleted file mode 100644
index d3a1c34e6def..000000000000
--- a/metadata/md5-cache/net-nds/nsscache-0.30
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=commandline tool to sync directory services to local cache
-EAPI=5
-HOMEPAGE=https://github.com/google/nsscache
-IUSE=nsscache python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] nsscache? ( >=sys-auth/libnss-cache-0.10 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/nsscache/archive/version/0.30.tar.gz -> nsscache-0.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba95061a3f06da59313139b33d9243fe
diff --git a/metadata/md5-cache/net-nds/nsscache-0.30-r2 b/metadata/md5-cache/net-nds/nsscache-0.30-r2
deleted file mode 100644
index 5a91a1b39af0..000000000000
--- a/metadata/md5-cache/net-nds/nsscache-0.30-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=commandline tool to sync directory services to local cache
-EAPI=5
-HOMEPAGE=https://github.com/google/nsscache
-IUSE=nsscache python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] nsscache? ( >=sys-auth/libnss-cache-0.10 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/nsscache/archive/version/0.30.tar.gz -> nsscache-0.30.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-gentoo-authorized-keys-command.py
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0815b47f8b5d44946c5cb7ae79e24a31
diff --git a/metadata/md5-cache/net-nds/nsscache-0.31 b/metadata/md5-cache/net-nds/nsscache-0.31
deleted file mode 100644
index 94854dabd345..000000000000
--- a/metadata/md5-cache/net-nds/nsscache-0.31
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=commandline tool to sync directory services to local cache
-EAPI=5
-HOMEPAGE=https://github.com/google/nsscache
-IUSE=nsscache python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] nsscache? ( >=sys-auth/libnss-cache-0.10 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/nsscache/archive/version/0.31.tar.gz -> nsscache-0.31.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb1099b749514b83ba2a41b209545033
diff --git a/metadata/md5-cache/net-nds/nsscache-0.32 b/metadata/md5-cache/net-nds/nsscache-0.32
deleted file mode 100644
index 616ab6836390..000000000000
--- a/metadata/md5-cache/net-nds/nsscache-0.32
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=commandline tool to sync directory services to local cache
-EAPI=5
-HOMEPAGE=https://github.com/google/nsscache
-IUSE=nsscache python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] nsscache? ( >=sys-auth/libnss-cache-0.10 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/nsscache/archive/version/0.32.tar.gz -> nsscache-0.32.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb1099b749514b83ba2a41b209545033
diff --git a/metadata/md5-cache/net-nds/nsscache-0.39 b/metadata/md5-cache/net-nds/nsscache-0.39
new file mode 100644
index 000000000000..a1807f84e9f0
--- /dev/null
+++ b/metadata/md5-cache/net-nds/nsscache-0.39
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/ldap3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycurl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bsddb3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] s3? ( dev-python/boto3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=commandline tool to sync directory services to local cache
+EAPI=7
+HOMEPAGE=https://github.com/google/nsscache
+IUSE=nsscache s3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/ldap3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycurl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bsddb3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] s3? ( dev-python/boto3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) nsscache? ( >=sys-auth/libnss-cache-0.10 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/google/nsscache/archive/version/0.39.tar.gz -> nsscache-0.39.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f94d67afc41f4599be605bc4c661df9d
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 7bf5700918a9..402b3630046c 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.1 b/metadata/md5-cache/net-p2p/tremc-0.9.1
deleted file mode 100644
index 81f0b675db5d..000000000000
--- a/metadata/md5-cache/net-p2p/tremc-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Ncurses interface for the Transmission BitTorrent client
-EAPI=7
-HOMEPAGE=https://github.com/tremc/tremc
-IUSE=geoip python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( geoip? ( dev-python/geoip-python[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/tremc/tremc/archive/0.9.1.tar.gz -> tremc-0.9.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13c9bb6f5a4930c38603ffb41bce7669
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2 b/metadata/md5-cache/net-p2p/tremc-0.9.2
new file mode 100644
index 000000000000..1d1040fdf60f
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup
+DESCRIPTION=Ncurses interface for the Transmission BitTorrent client
+EAPI=7
+HOMEPAGE=https://github.com/tremc/tremc
+IUSE=python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/tremc/tremc/archive/0.9.2.tar.gz -> tremc-0.9.2.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ff1746299633a982f49b72d8f3500310
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index a5f4de0bafb6..8d3238abbf9f 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/squid-4.11 b/metadata/md5-cache/net-proxy/squid-4.11
deleted file mode 100644
index b5e532a90b12..000000000000
--- a/metadata/md5-cache/net-proxy/squid-4.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl >=app-portage/elt-patches-20170815 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0 ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit )
-DESCRIPTION=A full-featured web proxy cache
-EAPI=7
-HOMEPAGE=http://www.squid-cache.org/
-IUSE=caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite perl qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux kernel_linux
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0 ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 samba? ( net-fs/samba ) perl? ( dev-lang/perl ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite )
-REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.11.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=01a8427b4ebc0f0b43c64270e738d9e4
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 439872bfd08f..36dd3d2b80f7 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
index b8325395e278..687589f79a44 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03772d67d467981c409f0e8d52b3717b
+_md5_=acddeacf42c9132aa8b69fd9178fd6ad
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index af418d8ee1be..d1982b9fa1aa 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/iverilog-10.3 b/metadata/md5-cache/sci-electronics/iverilog-10.3
index a3309a46c6ea..7766fb5801fa 100644
--- a/metadata/md5-cache/sci-electronics/iverilog-10.3
+++ b/metadata/md5-cache/sci-electronics/iverilog-10.3
@@ -5,10 +5,10 @@ DESCRIPTION=A Verilog simulation and synthesis tool
 EAPI=7
 HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
 IUSE=examples
-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=LGPL-2.1
 RDEPEND=sys-libs/readline:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/steveicarus/iverilog/archive/v10_3.tar.gz -> iverilog-10.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2aff4ffce7c353432fb0313d02cb3b0f
+_md5_=e0d0d3128769a8fc437c0841081f815c
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b5a9dc1c300a..69dada7ba3fe 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0 b/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0
index f24a3c6a0159..6492a7978b03 100644
--- a/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0
+++ b/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0
@@ -11,6 +11,6 @@ RDEPEND=dev-libs/jsoncpp:= >=sci-chemistry/molequeue-0.7 sci-libs/spglib archive
 REQUIRED_USE=vtk? ( qt5 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/OpenChemistry/avogadrolibs/archive/1.93.0.tar.gz -> avogadrolibs-1.93.0.tar.gz vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )
+SRC_URI=https://github.com/OpenChemistry/avogadrolibs/archive/1.93.0.tar.gz -> avogadrolibs-1.93.0.tar.gz vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern -> linux64-genXrdPattern-avogadrolibs-1.93.0 )
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1bf20bf67bdd6b452dffb0eda1c43e9
+_md5_=cdf516b2c1c0043e60c5c6e0153db915
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4a5ebd7e2b82..e61ad2b766ac 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/accountsservice-0.6.55 b/metadata/md5-cache/sys-apps/accountsservice-0.6.55
index c6de784c3f60..65562eb1a083 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.55
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.55
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc consolekit elogind gtk-doc +introspection selinux systemd
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit consolekit? ( sys-auth/consolekit ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) selinux? ( sec-policy/selinux-accountsd )
 REQUIRED_USE=^^ ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.55.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aa8faaefbfbf449994e34ff5ab3312bf
+_md5_=478b4d9bfd6fb98c3b61259a1249a771
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.12 b/metadata/md5-cache/sys-apps/haveged-1.9.13
similarity index 85%
rename from metadata/md5-cache/sys-apps/haveged-1.9.12
rename to metadata/md5-cache/sys-apps/haveged-1.9.13
index 91cc086991b6..5faa26542f6b 100644
--- a/metadata/md5-cache/sys-apps/haveged-1.9.12
+++ b/metadata/md5-cache/sys-apps/haveged-1.9.13
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.12.tar.gz -> haveged-1.9.12.tar.gz
+SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.13.tar.gz -> haveged-1.9.13.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=30898bb4487ae0ee2a1c0778cfca03b1
diff --git a/metadata/md5-cache/sys-apps/iucode_tool-2.1.1 b/metadata/md5-cache/sys-apps/iucode_tool-2.1.1
deleted file mode 100644
index e36dc7477fa8..000000000000
--- a/metadata/md5-cache/sys-apps/iucode_tool-2.1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=tool to manipulate Intel X86 and X86-64 processor microcode update collections
-EAPI=6
-HOMEPAGE=https://gitlab.com/iucode-tool/
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_2.1.1.tar.xz
-_md5_=5a3159f799a2e71c2e4c768785ec6df2
diff --git a/metadata/md5-cache/sys-apps/iucode_tool-2.1.2 b/metadata/md5-cache/sys-apps/iucode_tool-2.1.2
deleted file mode 100644
index 8633b97456e9..000000000000
--- a/metadata/md5-cache/sys-apps/iucode_tool-2.1.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=tool to manipulate Intel X86 and X86-64 processor microcode update collections
-EAPI=6
-HOMEPAGE=https://gitlab.com/iucode-tool/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_2.1.2.tar.xz
-_md5_=66d797b526df29125ce0a78192093db3
diff --git a/metadata/md5-cache/sys-apps/iucode_tool-2.2 b/metadata/md5-cache/sys-apps/iucode_tool-2.2
deleted file mode 100644
index 6cc95bce9fda..000000000000
--- a/metadata/md5-cache/sys-apps/iucode_tool-2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=tool to manipulate Intel X86 and X86-64 processor microcode update collections
-EAPI=6
-HOMEPAGE=https://gitlab.com/iucode-tool/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_2.2.tar.xz
-_md5_=66d797b526df29125ce0a78192093db3
diff --git a/metadata/md5-cache/sys-apps/iucode_tool-2.3 b/metadata/md5-cache/sys-apps/iucode_tool-2.3
deleted file mode 100644
index 5ea513b8e07b..000000000000
--- a/metadata/md5-cache/sys-apps/iucode_tool-2.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=tool to manipulate Intel X86 and X86-64 processor microcode update collections
-EAPI=6
-HOMEPAGE=https://gitlab.com/iucode-tool/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_2.3.tar.xz
-_md5_=82857d74e956f06401ec0c1e6a4c240e
diff --git a/metadata/md5-cache/sys-apps/iucode_tool-2.3.1 b/metadata/md5-cache/sys-apps/iucode_tool-2.3.1-r1
similarity index 85%
rename from metadata/md5-cache/sys-apps/iucode_tool-2.3.1
rename to metadata/md5-cache/sys-apps/iucode_tool-2.3.1-r1
index d0c8262643b6..9a164d4af772 100644
--- a/metadata/md5-cache/sys-apps/iucode_tool-2.3.1
+++ b/metadata/md5-cache/sys-apps/iucode_tool-2.3.1-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=tool to manipulate Intel X86 and X86-64 processor microcode update collections
-EAPI=6
+EAPI=7
 HOMEPAGE=https://gitlab.com/iucode-tool/
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_2.3.1.tar.xz
-_md5_=6e6690615ac71933716cc732a4420d38
+_md5_=270af7d09764141fbf63e569a86ca33a
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.35.2 b/metadata/md5-cache/sys-apps/util-linux-2.35.2
index 16a2041aa6be..72e38cb2ba68 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.35.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.35.2
@@ -5,7 +5,7 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=fc9c8a8648a3b3ce6b10687c78ca728d
+_md5_=128e5a9fa92e442d84145ce170f39e86
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30 b/metadata/md5-cache/sys-apps/x86info-1.30
deleted file mode 100644
index 9f12d113f6ce..000000000000
--- a/metadata/md5-cache/sys-apps/x86info-1.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) sys-apps/pciutils:=
-DESCRIPTION=Dave Jones' handy, informative x86 CPU diagnostic utility
-EAPI=6
-HOMEPAGE=http://www.codemonkey.org.uk/projects/x86info/
-IUSE=kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils:=
-SLOT=0
-SRC_URI=http://www.codemonkey.org.uk/projects/x86info/x86info-1.30.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a809e09ecb57a4ecf8b7599447e2a36
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30_p20190617 b/metadata/md5-cache/sys-apps/x86info-1.30_p20190617
new file mode 100644
index 000000000000..b5c2c09a7eea
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/x86info-1.30_p20190617
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst setup
+DEPEND=sys-apps/pciutils:=
+DESCRIPTION=Dave Jones' handy, informative x86 CPU diagnostic utility
+EAPI=7
+HOMEPAGE=http://www.codemonkey.org.uk/projects/x86info/
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils:=
+SLOT=0
+SRC_URI=https://github.com/kernelslacker/x86info/archive/8ea5ed19fae1d209eba9257171a10f7afd474618.tar.gz -> x86info-1.30_p20190617.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8ca2b26e3b934034fab9042fc3cb1a07
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index b576095aaf91..d42d29b59275 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/mbuffer-20191016 b/metadata/md5-cache/sys-block/mbuffer-20191016
index 0cce1a6a6a04..353e3083e2b8 100644
--- a/metadata/md5-cache/sys-block/mbuffer-20191016
+++ b/metadata/md5-cache/sys-block/mbuffer-20191016
@@ -5,7 +5,7 @@ DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functi
 EAPI=7
 HOMEPAGE=https://www.maier-komor.de/mbuffer.html
 IUSE=debug ssl test
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
+KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=GPL-3
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=test? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.maier-komor.de/software/mbuffer/mbuffer-20191016.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ac4343910f8e6169c5ee92e7ed5f651
+_md5_=c030e4e1561aaeb54640a093256ab3be
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 840ad660b99b..5b9cb25efdc5 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.4 b/metadata/md5-cache/sys-cluster/galera-26.4.4
index 5af2bfb553dc..9e9fd7eaf42f 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.4
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep
 EAPI=7
 HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.13/galera-26.4.4/src/galera-26.4.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9d8198bf3f0d84ca9a82c45487ef7433
+_md5_=81fc35526c5dd0435540f67bf85911a9
diff --git a/metadata/md5-cache/sys-cluster/heat-13.0.0 b/metadata/md5-cache/sys-cluster/heat-13.0.0
deleted file mode 100644
index 2d439df600dd..000000000000
--- a/metadata/md5-cache/sys-cluster/heat-13.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
-EAPI=7
-HOMEPAGE=https://launchpad.net/heat
-IUSE=+mysql +memcached postgres sqlite python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/croniter-0.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/neutron-lib-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.11.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/aodhclient-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-blazarclient-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-heatclient-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-magnumclient-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-manilaclient-1.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-monascaclient-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-octaviaclient-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-saharaclient-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-zaqarclient-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-zunclient-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/yaql-1.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-13.0.0 https://tarballs.openstack.org/heat/openstack-heat-13.0.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=776027fc75625ff2bc6ea4bf4d8f234b
diff --git a/metadata/md5-cache/sys-cluster/heat-13.0.2 b/metadata/md5-cache/sys-cluster/heat-13.0.2
index 4eebbf359f8b..5ef877fac9b6 100644
--- a/metadata/md5-cache/sys-cluster/heat-13.0.2
+++ b/metadata/md5-cache/sys-cluster/heat-13.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration eng
 EAPI=7
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/croniter-0.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/neutron-lib-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.11.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/aodhclient-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-blazarclient-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-heatclient-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-magnumclient-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-manilaclient-1.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-monascaclient-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-octaviaclient-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-saharaclient-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-zaqarclient-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-zunclient-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/yaql-1.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] acct-user/heat acct-group/heat python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-13.0.2 https://tarballs.openstack.org/heat/openstack-heat-13.0.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=be8964da5764d8daab0c5211517b3dd5
+_md5_=a2dcdfc2f5519e72ff3fcda55fcd78eb
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 97aac8702237..e328c3ea0726 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.3.1 b/metadata/md5-cache/sys-devel/binutils-config-5.3.1
index dd710a2c5323..c7bdd2aecfb6 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.3.1
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.3.1
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to change the binutils version being used
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Toolchain
 IUSE=+native-symlinks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-config-5.3.1.tar.xz
 _eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=cdbeb644b00c5960463b63ea4b601fe3
+_md5_=0035e706a3f845432d817ae820fb13ca
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0 b/metadata/md5-cache/sys-devel/clang-10.0.0
index 5e11acd5f488..73bb2b06fc33 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.0 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.0* ) default-libcxx? ( >=sys-libs/libcxx-10.0.0 )
 RDEPEND=~sys-devel/llvm-10.0.0:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c15c9bbc9c99df7cf257eb41b76246b
+_md5_=9449cb25566b512f87bb97ec17e6cd39
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1.9999 b/metadata/md5-cache/sys-devel/clang-10.0.1.9999
index 9db1db826ac3..d41750a7dcef 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1.9999
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=10
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93fd9317940bc64080cf968df97a6085
+_md5_=b7fad3dfecf1bd934d69c9f93cccceaf
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1_rc1 b/metadata/md5-cache/sys-devel/clang-10.0.1_rc1
index be2795087c9c..92cae245fe1a 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1_rc1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44672d442fb8a284539b3141cd2fd1b2
+_md5_=b7a0757cd81fcb7937a4d20f3c666cfd
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-10.0.1_rc2
new file mode 100644
index 000000000000..48f28e04241b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1_rc2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/sphinx xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-10.0.1_rc2:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.1_rc2 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.1* ) default-libcxx? ( >=sys-libs/libcxx-10.0.1_rc2 )
+RDEPEND=~sys-devel/llvm-10.0.1_rc2:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7a0757cd81fcb7937a4d20f3c666cfd
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.0.9999 b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
index f9512af95afe..bbe091e57167 100644
--- a/metadata/md5-cache/sys-devel/clang-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=11
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56f810a1a03140423ef057e5272c340e
+_md5_=4211ec9c8478f888d842eaa4e7bf7e44
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.0 b/metadata/md5-cache/sys-devel/clang-common-10.0.0
index 8a08a8915692..0f2470569e98 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Common files shared between multiple slots of clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71b7e898a6295ae5b8b738fe4a4d39a5
+_md5_=395f312ba51342b92e88fb609db3314b
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-common-10.0.1_rc2
new file mode 100644
index 000000000000..d8698cefde5e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.1_rc2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:*
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a6513b1aae1caeb77b1491bb87b5058a
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
index 163b95b3fa6a..aac374d0a7f4 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=7
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-10.0.0:10.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-10.0.0:10.0.0 ) ) libcxx? ( >=sys-libs/libcxx-10.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-10.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=10.0.0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c0033f7cce0c5ff73c0772f242fcef96
+_md5_=3d2596a04a0c0e2275138384e87b4803
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-10.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-runtime-10.0.1_rc2
new file mode 100644
index 000000000000..c28f59db48b8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-10.0.1_rc2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=7
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-10.0.1_rc2:10.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-10.0.1_rc2:10.0.1 ) ) libcxx? ( >=sys-libs/libcxx-10.0.1_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-10.0.1_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=10.0.1
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=030edca88718b714982c65578733e09a
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.3 b/metadata/md5-cache/sys-devel/gcc-config-2.3
index 37f5b1385f46..d9fb0df2e239 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-2.3
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.3
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to manage compilers
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
 IUSE=+native-symlinks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.3.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e321ea638eeb4d82cb82574bf6893a58
+_md5_=903a0761814d375b774f58a120424421
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0 b/metadata/md5-cache/sys-devel/lld-10.0.0
index a4fc748d8622..1bbb5b47835a 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.0
+++ b/metadata/md5-cache/sys-devel/lld-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-10.0.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=509202225ef8f54a3277688142354d1a
+_md5_=6519cd21a61cde291307c869f1d9c7c0
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1_rc2 b/metadata/md5-cache/sys-devel/lld-10.0.1_rc2
new file mode 100644
index 000000000000..52239341e082
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( || ( ( dev-lang/python:3.9 ~dev-python/lit-10.0.1_rc2[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 ~dev-python/lit-10.0.1_rc2[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 ~dev-python/lit-10.0.1_rc2[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-10.0.1_rc2[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-10.0.1_rc2 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-10.0.1_rc2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.0 b/metadata/md5-cache/sys-devel/llvm-10.0.0
index d413cbb29833..1e647acefbe6 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-10 )
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6bd51b6dc58884aaaeb1edd98283c92
+_md5_=ae598f5d01e2ca5907b9760088b93e4f
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1.9999 b/metadata/md5-cache/sys-devel/llvm-10.0.1.9999
index 829112c8080c..2a28018ae689 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1.9999
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=10
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7fb9f5ec9f1c45d52e07780ed79861b
+_md5_=8907b54aab3d2db7cd9df2069724700c
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1 b/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1
index 825585c3d7ae..3d7ddb35537f 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e4b46935d00974fdfad08d84ca20ff5
+_md5_=2439dcfe0d70a82f0611b55a9da43df9
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1_rc2 b/metadata/md5-cache/sys-devel/llvm-10.0.1_rc2
new file mode 100644
index 000000000000..46b2775dbc8f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1_rc2
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-10.0.1.9999 >=sys-devel/binutils-apple-5.1 ) libffi? ( virtual/pkgconfig ) || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] doc? ( dev-python/recommonmark[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] doc? ( dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] doc? ( dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] doc? ( dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-10 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2439dcfe0d70a82f0611b55a9da43df9
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
index 92eee41a486c..edced33c3ef7 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=11
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1830c07471daba45916fb8286730a14e
+_md5_=c2adf5d208da2bfbb781e838c06363a8
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.0 b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
index 1bc6c4466ff1..ccc0eb931693 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=c1cc28fb691f9b22377a01fee75ccab6
+_md5_=7a45217a0eeebc15352c3fa13c23bd33
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc2 b/metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc2
new file mode 100644
index 000000000000..a669bd33cc14
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
diff --git a/metadata/md5-cache/sys-devel/llvmgold-10 b/metadata/md5-cache/sys-devel/llvmgold-10
index 191c5002c1dd..7c3777b668c8 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-10
+++ b/metadata/md5-cache/sys-devel/llvmgold-10
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:10[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=0146571a7c05812e099e6def0e24317a
+_md5_=968168ec66efafc9792b6ec61153e515
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 521d31c8d90a..9f57bd11fb32 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617 b/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617
index 3e8535ea2d82..161baa83d26e 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/iucode_tool
+BDEPEND=>=sys-apps/iucode_tool-2.3
 DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
 DESCRIPTION=Intel IA32/IA64 microcode update data
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20200616.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20200617.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=829dc73306d7dffd7f8ba432befd1ba1
+_md5_=464bd7dd81528880330132f0856a6f5e
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index a50c1fa8bb13..a0b9b5d9deec 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/lsscsi-0.31 b/metadata/md5-cache/sys-fs/lsscsi-0.31
index 5d67561cfba4..8d4ed643c1ed 100644
--- a/metadata/md5-cache/sys-fs/lsscsi-0.31
+++ b/metadata/md5-cache/sys-fs/lsscsi-0.31
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=SCSI sysfs query tool
 EAPI=7
 HOMEPAGE=http://sg.danny.cz/scsi/lsscsi.html
-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=GPL-2
 SLOT=0
 SRC_URI=http://sg.danny.cz/scsi/lsscsi-0.31.tgz
-_md5_=3b387f406074938b0694beac2671ab98
+_md5_=33bce0aff679a8a4a86d978a272abe93
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index acdb0ab82c33..b8fe7621f56c 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/aufs-sources-4.14.138 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
index 6b7dc7825cc9..e0a7775c3d44 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.138
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-147.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-147.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-147.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-147.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-147.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-147.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-147.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-147.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-147.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1817b7410db36769e68b59d72f5e968b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
index a94eff0a81f0..ef34f9846038 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.143
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-152.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-152.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-152.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-152.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-152.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-152.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-152.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-152.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-152.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdebd609d79dcb0a52d7e36641da6b3d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
index 21347bcafca0..92208097c6a6 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.144
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-153.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-153.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-153.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-153.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-153.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-153.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-153.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-153.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-153.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aa8afe5a7f31110d53f424fc3c8d590
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
index 9febd1a47c22..8facc044ae3b 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.145
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-154.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-154.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-154.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-154.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-154.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-154.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-154.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-154.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-154.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21db3be65d3e9cdaaa84d5bf9ba3a8dd
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
index 423d25daf5a2..f9065841beb8 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.146
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-155.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-155.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-155.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-155.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-155.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-155.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-155.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-155.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-155.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0fa0b3c45d68849861a0e7ea18e4cf97
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
index 9caaa0f2a459..6a7d4c93ed1e 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.147
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-156.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-156.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-156.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-156.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-156.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-156.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-156.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-156.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-156.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=902485ef69809fb8c813263eb2a10070
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
index 46962d2e9e95..76c16aae84e8 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.148
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-157.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-157.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-157.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-157.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-157.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-157.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-157.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-157.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-157.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2a70c765a6a64441271e738e92dc7d8
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
index bc105b165095..f16720620332 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.149
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-158.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-158.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-158.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-158.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-158.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-158.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-158.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-158.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0cca2dabba47dcaafef89c714f7a6ffc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
index c347ca328610..efda49778f4e 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.150
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20191021.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-159.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-159.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-159.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-159.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-159.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-159.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-159.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-159.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf984944c0282e0e7f2a5b8c29815e6c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
index c8fbb3ed7e49..340e740fb1a0 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.66
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-66.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-66.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-66.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-66.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-66.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-66.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-66.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-66.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-66.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a0a5f9b9ee27dca68d154ff61399290
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
index 3a9d4d9b44db..8909c6f51893 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.72
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-71.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-71.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-71.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-71.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-71.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-71.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-71.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-71.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-71.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a176205d50a8c548c21ad6705f442dbd
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
index e3354a42bc24..a240d4cdda22 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.73
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-72.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-72.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-72.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-72.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-72.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-72.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-72.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-72.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-72.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4927148c0a23a82ac194c833244e78c0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
index 46f49a2e08a8..d76e1adc9dcd 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.74
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-73.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-73.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-73.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-73.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-73.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-73.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-73.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-73.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-73.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a51879bf7bdb0161f7525a5bd7776301
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
index 77a36dc0094a..b3393d4bfbc1 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.75
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-74.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-74.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-74.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-74.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-74.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-74.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-74.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-74.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d61a1f12915ff94898410e9d67426080
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
index 4033f5ebe757..d87a852cbb01 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.76
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-75.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-75.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-75.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-75.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-75.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-75.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-75.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-75.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aedbcdbed154c377dea8c5b766e7bb75
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
index 87ab43e34903..512b6e57acaf 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.77
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-76.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-76.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-76.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-76.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-76.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-76.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-76.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-76.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-76.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4bd61e56e4a33ec2535a6ffc49f0941d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
index 9b95bd86385a..a12875f613b7 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.78
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-77.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-77.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-77.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-77.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-77.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-77.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-77.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-77.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-77.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a59de7fd069601cec1447204b28c20b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
index 5fc5b922e286..3c960ac2e41c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.79
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-78.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-78.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-78.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-78.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-78.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-78.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-78.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-78.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0690208d5a5d8b770d061c551fda734b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
index 20797b733269..a1af9c7aa968 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.80
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20191021.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-79.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-79.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-79.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-79.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-79.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-79.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-79.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-79.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-79.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=716d6b05b93761def5446a6f82dfb978
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
index d3a74eb7a3c2..20c2aad2e2ba 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.13
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-13.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0a21e956219e543aed57261997cdb24
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
index 5c55fb3c2d62..a26a37db6723 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.14
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-14.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-14.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-14.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-14.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-14.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-14.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-14.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e534a5a28c6aca499e8d449213b155a4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
index c1b23fae2b21..e24aa8d8eb01 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.15
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-15.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-15.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-15.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-15.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-15.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-15.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-15.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=963e2b1722c7ce2e1e8f62656e5384a1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
index 3977621e8a82..1ea4383c31bc 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.16
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-16.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-16.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-16.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-16.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-16.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-16.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-16.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-16.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=04589113582263adf3e6665a5f751385
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
index ca0447e43b85..855b94de2be4 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.17
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-17.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-17.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-17.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-17.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-17.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-17.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-17.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aab04cdca543f8f4464452e47f4b2e9b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
index 918360bdc4f7..dc22f7f583a8 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.18
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-18.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-18.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-18.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-18.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-18.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-18.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-18.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dfa7662a75e144658d6c1cc769dea6e0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
index 3141aff7fa45..785f4f0e066b 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.19
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-19.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-19.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-19.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-19.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-19.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-19.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-19.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a553b0e114bdd76a1da030206ce9a8e6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
index 2df874482c98..e1b6f28f8faa 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.20
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-20.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-20.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-20.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-20.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-20.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-20.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-20.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c71a565a756fb6e4f106f3aed71bddc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
index 9f3dbf094d9c..19b65ea8205f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-2.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dfc412a0c5daa06d731d1d580ecdf8d6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
index a2e3a310a96e..da6f40b68327 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-3.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-3.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-3.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-3.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=334e4a82ed776a57b4d8d2ae502167cb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
index f6bad12638ae..555e95a7b002 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-4.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-4.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-4.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-4.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-4.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-4.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-4.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-4.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fd837a03c9917ccbfb29a375602fa37
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
index 0da17efbac66..ee2b302a97d9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-5.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-5.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-5.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-5.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-5.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-5.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6101d4717fd4ef918bcebec77e8ee04d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
index a4197de062b0..9dde8e2eabd9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-6.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=486cd3cec438477e88dde20d1db94967
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
index aace468f5235..c413dd1a1601 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.6-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-8.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5242e0097a2f28e3fc2dc3a5ce07b89
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
index 06cf3c8dd635..029df02a235c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20191021.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-9.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bb9e718c37217378c60e597670fb974b
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
index e6cd53c4ef56..15eff876ffd9 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.170-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.170-FC.01/kernel-4.14.170-FC.01.tar.xz
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=c3c83579bcbbfe51949c39debffccfab
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index e390be7f30e7..f81c7ac584fa 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.178-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=094d32a5460cfeff0c856475320945df
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
index a2964ea5a412..3945d4faa591 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=5.4.38-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/5.4.38-FC.01/kernel-5.4.38-FC.01.tar.xz
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=094d32a5460cfeff0c856475320945df
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.4.37 b/metadata/md5-cache/sys-kernel/ck-sources-5.4.37
index 1cc13e8c5e8d..439144720480 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-5.4.37
+++ b/metadata/md5-cache/sys-kernel/ck-sources-5.4.37
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.37
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-37.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-37.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-37.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-37.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-37.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-37.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-37.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-37.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-37.experimental.tar.xz ) http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=029128b2aa7dd16b9faa7fb553a40c3c
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.4.48 b/metadata/md5-cache/sys-kernel/ck-sources-5.4.48
index 210fc8b12b07..b975bce669b8 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-5.4.48
+++ b/metadata/md5-cache/sys-kernel/ck-sources-5.4.48
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.48
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.experimental.tar.xz ) http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d0d8539fe115382991d5fe671bc13203
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.9 b/metadata/md5-cache/sys-kernel/genkernel-4.0.9
deleted file mode 100644
index b725b0ac26f8..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-IUSE=ibm +firmware
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.0.9.tar.xz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.79.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.4.tar.gz -> zstd-1.4.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b90c0718cc4b112df092bce7ccf701cd
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.9-r1 b/metadata/md5-cache/sys-kernel/genkernel-4.0.9-r1
new file mode 100644
index 000000000000..0bd0e3e78448
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.0.9-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
+IUSE=ibm +firmware
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.0.9.tar.xz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-2020.80.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.4.tar.gz -> zstd-1.4.4.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=72143ad88c260b54786a71f5ceb4e628
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index 9d576849e709..eac203aa50d1 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
 SLOT=0
-SRC_URI=https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.79.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.4.tar.gz -> zstd-1.4.4.tar.gz
+SRC_URI=https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-2020.80.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.4.tar.gz -> zstd-1.4.4.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cecc3eb178f90dab2a0b9c7ebece99b8
+_md5_=d80fff1eadb582abc1d3fd1f6da7b786
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
index 42390028f07c..3bb1df8bc922 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.40 !sys-kernel/vanilla-kernel-bin:5.4.40
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3d20e359870a68c44a4822295e795f5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
index dc6c3dff02b4..b1324ceaa6c2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.46 !sys-kernel/vanilla-kernel-bin:5.4.46
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
index 76cb209df72b..651a53cb93a7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.47 !sys-kernel/vanilla-kernel-bin:5.4.47
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48
index d51a05a7c571..23c96ea6f7dc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.48 !sys-kernel/vanilla-kernel-bin:5.4.48
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.48
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.49 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.49
index dc396c0655b2..12c7c8a2cc77 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.49
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.49
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.49 !sys-kernel/vanilla-kernel-bin:5.4.49
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.49
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
index 38fbd8d7e5a3..3af48a8ed65a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32a04801cee0eaa444ac7c8e4ef66e65
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
index 0bde417db146..1d5e53b07166 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32a04801cee0eaa444ac7c8e4ef66e65
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
index 20b6c27f65f0..7036de7b1407 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b30674cc9ef5ecb5282df28b9affba31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5
index 78a4052acd0e..5b91689b4e14 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.5
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b30674cc9ef5ecb5282df28b9affba31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.6
index 044878a1f87b..799bd9c59dc1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.6
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.6
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=39802f4425f0fc50dd8040ad30cfdd001bd2b40b -> linux-5.7.6-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a4d93cfe9f9e2ac4d1d2cbaf5f69042
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
index 0a1f1e5a96fb..c31e919a79fe 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.40 !sys-kernel/vanilla-kernel:5.4.40 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40-1.xpak -> gentoo-kernel-5.4.40-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40-1.xpak -> gentoo-kernel-5.4.40-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=9012e8c93bb1e67d607665e63c5ce47d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
index 1dbcb625fa3f..0af45d4ce993 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.46 !sys-kernel/vanilla-kernel:5.4.46 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.46-1.xpak -> gentoo-kernel-5.4.46-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.46-1.xpak -> gentoo-kernel-5.4.46-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
index 33c20440a8ce..a5bd4d442441 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.47 !sys-kernel/vanilla-kernel:5.4.47 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.47-1.xpak -> gentoo-kernel-5.4.47-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.47-1.xpak -> gentoo-kernel-5.4.47-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48
index f89e70c0ff0b..030fcce8f3ac 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.48 !sys-kernel/vanilla-kernel:5.4.48 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.48
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48-1.xpak -> gentoo-kernel-5.4.48-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48-1.xpak -> gentoo-kernel-5.4.48-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.49 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.49
index 3e42f8e0dbf0..2827a4fa3f8d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.49
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.49
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.49 !sys-kernel/vanilla-kernel:5.4.49 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.49
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.49-1.xpak -> gentoo-kernel-5.4.49-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.49-1.xpak -> gentoo-kernel-5.4.49-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
index d38f593de4b0..a22d27d5af54 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.6.18 !sys-kernel/vanilla-kernel:5.6.18 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.18-1.xpak -> gentoo-kernel-5.6.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.18-1.xpak -> gentoo-kernel-5.6.18-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
index 96d1f5560774..a333d6dc157f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.6.19 !sys-kernel/vanilla-kernel:5.6.19 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.19-1.xpak -> gentoo-kernel-5.6.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.19-1.xpak -> gentoo-kernel-5.6.19-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
index 95635c5247f8..1b69b54bba1c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.7.4 !sys-kernel/vanilla-kernel:5.7.4 !sys-ke
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.4-1.xpak -> gentoo-kernel-5.7.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.4-1.xpak -> gentoo-kernel-5.7.4-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5
index 2c39a3e19be1..c78eb608df2e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.7.5 !sys-kernel/vanilla-kernel:5.7.5 !sys-ke
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.5
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5-1.xpak -> gentoo-kernel-5.7.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5-1.xpak -> gentoo-kernel-5.7.5-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.6
index 1b7e1090aef7..8307f569f7b5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.6
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.7.6 !sys-kernel/vanilla-kernel:5.7.6 !sys-ke
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.6
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.6-1.xpak -> gentoo-kernel-5.7.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.6-1.xpak -> gentoo-kernel-5.7.6-1.x86.xpak )
-_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
index 3f823c90ad75..6c742b3ee55f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.178
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-188.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-188.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-188.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-188.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-188.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-188.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-188.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-188.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-188.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e3ae0819d4be7d6d1ec86baba1e5aa2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
index 3dda91e3a283..2d2835d31b43 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.182
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-192.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-192.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-192.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-192.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-192.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-192.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-192.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-192.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-192.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d735688f89ff2a1f9f0a2fe697c31d73
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183
index 198f73868bb4..4215b1bd022e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.183
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-193.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-193.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-193.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-193.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-193.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-193.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-193.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-193.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-193.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=367ba1dfb8f0e35c06efc39fa0871a30
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.184 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.184
index 81ef5f12e062..54a386fced0b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.184
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.184
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.184
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-194.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-194.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-194.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-194.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-194.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-194.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-194.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-194.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-194.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe9dd27a8f5535bd7615fc34574a2ed9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.185 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.185
index e411b2c274de..3a961e2c6749 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.185
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.185
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.185
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-195.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-195.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-195.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-195.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-195.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-195.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-195.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-195.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-195.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63ba588838fabf6770bde66bbfbfaf69
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.186 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.186
index 30660f683b47..a9ccad32e65c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.186
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.186
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.186
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-196.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-196.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-196.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-196.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-196.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-196.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-196.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-196.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-196.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3c1da8dd0a2fd1fac3d44e6179206e7c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
index 1758c6751c08..9b1644483c4c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.120
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-119.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-119.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-119.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-119.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-119.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-119.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-119.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-119.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-119.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=90754527370cd6977cbec43215d555ce
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126
index 6524ddd3ac87..9aab52109607 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.126
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-125.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-125.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-125.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-125.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-125.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-125.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-125.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-125.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-125.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d4e131f73e4b90cb7e59e553343180cf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.127 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.127
index 60ac69b803df..f99bf3f33991 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.127
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.127
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.127
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-126.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-126.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-126.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-126.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-126.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-126.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-126.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-126.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-126.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9fcae1b2c2ca97c25c3e64794100b0b8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.128 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.128
index c989d6acf52c..9a5e13b9a572 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.128
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.128
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.128
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-127.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-127.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-127.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-127.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-127.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-127.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-127.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-127.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-127.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12f868013ac4ca3bd8a88bbf8a1c38ae
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.129 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.129
index cdff19cccd40..084387c62d1f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.129
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.129
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.129
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-128.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-128.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-128.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-128.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-128.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-128.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-128.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-128.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e85a27486209a2cda68a5593f1d0496
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.130 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.130
index bb029a0a1653..0b4cde8773bd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.130
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.130
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.130
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-129.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-129.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-129.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-129.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-129.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-129.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-129.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-129.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-129.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=003532950254fd48d90c894810d32b25
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
index 30c110b4e566..9b9ee8894456 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.221
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-222.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-222.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-222.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-222.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-222.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-222.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-222.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-222.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-222.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bbb4cd4903b28194d7193f5657d57632
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
index eab96ba43e04..538fbfb604dd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.225
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-226.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-226.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-226.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-226.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-226.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-226.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-226.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-226.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-226.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e5a53a472e09a74ec51afc3c2a520fb7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226
index 1bcf59b62ac1..b67a8ddd148c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.226
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-227.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-227.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-227.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-227.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-227.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-227.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-227.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-227.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-227.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=98ae198b569b708d2e8ae6ab72b91de6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.227 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.227
index 275f51061444..426d7ec2f54b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.227
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.227
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.227
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-228.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-228.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-228.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-228.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-228.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-228.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-228.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-228.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-228.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=119a7691e3cd8d8a51bd8045f2a5d4bf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.228 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.228
index 3e4b979cf2ae..717686e7ed4d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.228
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.228
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.228
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-229.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-229.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-229.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-229.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-229.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-229.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-229.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-229.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-229.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1903d033cc13e6942dd4077f18248f18
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
index 6b3459c85697..cb9a3f93a097 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.221
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-225.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-225.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-225.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-225.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-225.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-225.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-225.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-225.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-225.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33130caaa3ccc24ba82a29fe658f4215
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
index 45e860806797..271000841a71 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.225
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-229.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-229.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-229.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-229.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-229.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-229.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-229.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-229.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-229.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e9ef4e9728c578cd0a4235c5c0c89c63
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226
index 0a34deb5bf95..db4189998653 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.226
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-230.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-230.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-230.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-230.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-230.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-230.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-230.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-230.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-230.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06f29479d310d6255054018227b1c613
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.227 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.227
index 03f912e565db..1be0dffea34b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.227
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.227
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.227
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-231.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-231.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-231.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-231.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-231.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-231.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-231.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-231.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-231.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a304022f908b08474d51cba67523d038
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.228 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.228
index 36480bf9b2a9..6c30073c5b9d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.228
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.228
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.228
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-232.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-232.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-232.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-232.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-232.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-232.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-232.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-232.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-232.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c319d1005965b529dee87dfd973f9dad
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
index 2d05b65c13c1..4eb439c86a45 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.38
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-38.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-38.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-38.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-38.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-38.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-38.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-38.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-38.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-38.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=933105739b5d29ec261c129c0f1ad005
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44
index f3fe13df937f..fd9058b07a92 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.44
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-44.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-44.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-44.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-44.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-44.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-44.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-44.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-44.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-44.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0df706ec84eb469ba5f6e3576e314af7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.45 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.45
index 6723de019635..52eb3cf381d3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.45
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.45
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.45
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-45.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-45.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-45.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-45.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-45.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-45.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-45.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-45.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-45.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6ab458b8d190a50b70304b48ec58bcff
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.46 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.46
index c6ceb940e321..8aff81fb105a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.46
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.46
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-46.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-46.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-46.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-46.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-46.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-46.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e07ffe14bc8bb97bfd4588100f9ad75f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.47 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.47
index afd50da640d9..cabd734dd7b7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.47
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.47
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-47.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-47.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-47.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-47.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-47.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=463eecb182159346920bdabd6a11347d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.48
index c752298750b2..1ad53a9ff013 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.48
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.48
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.48
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a03359d309a100850eded93753deec83
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.49 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.49
index 0add69685582..8de86833888d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.49
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.49
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.49
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-49.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-49.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-49.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-49.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-49.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=508861d0dfb4412da0c1a26d8db6666b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16
index ccc86eb6e8d3..2d4f92018c79 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.16
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-20.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-20.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-20.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-20.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-20.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-20.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-20.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=623a5d4cde78e9675103508c1cb7fbb2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.17
index 07aafffa571c..62533d3f0504 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.17
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.17
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.17
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-21.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-21.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-21.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-21.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-21.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-21.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-21.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-21.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-21.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b7f362eacf767ee2a8eace8578c46474
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.18 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.18
index ca33495e2e29..260ede552e51 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.18
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.18
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-22.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-22.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-22.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-22.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-22.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=abdb10084360dec61d8d43f90e06539a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.19 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.19
index d759166f8e16..73f5a4caa85a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.19
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-23.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-23.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-23.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-23.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-23.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-23.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=30290b4f29d1970e3d92dba68eccadf2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
index f3a16398ea8c..e8a1f5e6ff5b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eaf7b6c723f028df333e1677397b25c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.1
index 220f1cd9d248..a6b18875c38a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-2.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c87638fce1a7accc8af65463bf1dfbde
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.2
index 6262845afbff..a82a8d417f93 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.2
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-3.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-3.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-3.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-3.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e347b1551c6ef1e4774129a1d24c41d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.3
index 59860c48df91..700809e0236f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.3
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-4.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-4.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-4.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-4.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-4.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-4.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-4.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-4.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5d0ce1f45a803f22ed0aaf4efc2c930b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.4
index b33b9c2c3090..c373ed96bf68 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-5.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-5.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-5.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b1333b605556c2c82cef6e856a4abdb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.5
index e3b1a4675097..4dd55eeb42c6 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-6.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0651c9fbd9db2a5b27c29f7f2d249f6c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.6
index 806b2f425839..e486f057d3c4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-7.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-7.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-7.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-7.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3751e40e471920ac524f8451515f63cf
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc1
index f1300ec82cd7..28dac6c1d8f3 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.8_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.8-rc1/v5.7 -> patch-5.8-rc1.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb03c81bebb1c38d60bba9deb807c184
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc2
index 975b9faf269b..739bc10bcd54 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.8_rc2
 SRC_URI=https://git.kernel.org/torvalds/p/v5.8-rc2/v5.7 -> patch-5.8-rc2.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb03c81bebb1c38d60bba9deb807c184
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc3
index a27b8e6a3797..f11bc1629f97 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.8_rc3
 SRC_URI=https://git.kernel.org/torvalds/p/v5.8-rc3/v5.7 -> patch-5.8-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb03c81bebb1c38d60bba9deb807c184
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 78c01451fbdc..53b61d23909e 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7473fbec72c0fc5338c08c3fd3d07096
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index 851ad82f7753..16418cbe6c63 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=303272bc8f97d0039f6bb0f231f9f97c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index c0068ea9be5e..7d1246aa2990 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b56280b7be153e420f220825811e54d
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index a8698d6ebd18..ab2703c2c2a6 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4ad70e3eb60d79af9d68479007ea084c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index 47b015284867..99a48085988a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85c38bb174de51bf8ba559c6aa4b2d7c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4 b/metadata/md5-cache/sys-kernel/linux-headers-5.4
index dde239785088..815d517f6a52 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=991952e77ae73aa82c907422cdd68165
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
index f34f0349ec61..0592486d88c2 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-2.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63345219c25ba30bb38a3bff5dfc5471
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.5 b/metadata/md5-cache/sys-kernel/linux-headers-5.5
index 4669a0dfe11f..a21f70aa4929 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.5
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz mirror://gentoo/gentoo-headers-5.5-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.5-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=04d8000922d98cbd55a05074717e8d38
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.6 b/metadata/md5-cache/sys-kernel/linux-headers-5.6
index dd39025e1c2d..a1f367ee0bff 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.6
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz mirror://gentoo/gentoo-headers-5.6-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.6-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b94dffba7664a869c984d27bf35e2ffd
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.7 b/metadata/md5-cache/sys-kernel/linux-headers-5.7
index e3dd6b23b0f5..cd1f6d031198 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.7
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz mirror://gentoo/gentoo-headers-5.7-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.7-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b94dffba7664a869c984d27bf35e2ffd
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.149 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
index 354ff8491ceb..6452884a13c9 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.149
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.149.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5027788810911aa18959e0cef70ecd4
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20 b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
index 13e46ef7780b..d640c05c68c7 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.20
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.18.20.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/mipsgit-4.18.0-20181112.diff.xz mirror://gentoo/mips-sources-4.18.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56dae897a0cbdd350e18bc366510331d
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.79 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
index ed35da941743..87c8c639c3b4 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.79
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.79.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/mips-sources-4.19.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3acc227a6a94c226082cc9d10d1fef9
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.20.17 b/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
index 227df22a9fdd..2509079cebd7 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.17
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.20.17.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.tar.xz mirror://gentoo/mips-sources-4.20.0-patches-v1.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca38d2455e02d97e94d7536d183240c2
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.196 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
index c02c9020fdd5..099d1e0ce37c 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.196
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e6342ed11d529d37a3ff54a97c96d8b
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.196 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
index 025211c3df9c..5a0bdc91c1bd 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.196
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=382ed1c063df6d2e9bc130eea2d7ee16
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
index 49155765c81a..6bd510ecca5e 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf8.diff -> pf-sources-5.6_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p1
index 149cc8858582..f84b84ead80d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_p1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.7...v5.7-pf1.diff -> pf-sources-5.7_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4574f37786b15b23b805dda59cc78f9c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p2
index 70e0b723e659..6f289a8a5d8e 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.7...v5.7-pf2.diff -> pf-sources-5.7_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4574f37786b15b23b805dda59cc78f9c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p3
index 56845a15e3e8..c1288e729160 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.7...v5.7-pf3.diff -> pf-sources-5.7_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4574f37786b15b23b805dda59cc78f9c
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
index 9e758da91445..fbf4c2eace6c 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.9999
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=043cc21f7f575cd909e2d77fef0a0fb0
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
index 4588aa1aa72f..53777bc65071 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=5.4.9999
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=043cc21f7f575cd909e2d77fef0a0fb0
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
index 467d01f2774a..7e55468810a3 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.170_p75
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.170.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.170-rt75.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.170-rt75.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.184_p84 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.184_p84
index af9de5d6d3b4..b8439fb7ee5c 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.184_p84
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.184_p84
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.184_p84
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.184.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.184-rt84.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.184-rt84.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
index 125f84ff6a7b..5717caa35165 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.124_p53
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.124.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.124-rt53.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.124-rt53.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.127_p54 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.127_p54
index fdac27a4105e..91d3c476e36a 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.127_p54
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.127_p54
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.127_p54
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.127.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.127-rt54.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.127-rt54.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
index 24c2692eda3d..154f91c55363 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.220_p197
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.220.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.220-rt197.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.220-rt197.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.225_p198 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.225_p198
index cf8f7960eb5b..a7e9605bc6a9 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.225_p198
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.225_p198
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.225_p198
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.225.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.225-rt198.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.225-rt198.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
index babb7e669063..c79ff965c35d 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.224_p144
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.224.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.224-rt144.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.224-rt144.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.227_p146 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.227_p146
index f72da3ff0654..d3503cae1d07 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.227_p146
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.227_p146
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.227_p146
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.227.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.227-rt146.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.227-rt146.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
index 81330b98cb54..e8db5805a0a8 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.40_p24
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.40.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.40-rt24.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.40-rt24.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.44_p27 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.44_p27
index ac39032636c8..b703cf07bc0b 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.44_p27
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.44_p27
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.44_p27
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.44.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.44-rt27.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.44-rt27.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7 b/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
index 43b1d8de7660..eac129da183a 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.14_p7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-5.6 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-check -> deblob-check-5.6 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/patch-5.6.14-rt7.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.14-rt7.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.6.17_p10 b/metadata/md5-cache/sys-kernel/rt-sources-5.6.17_p10
index 8df9ad491d9d..33458937c2ca 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.6.17_p10
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.6.17_p10
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.17_p10
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.17.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-5.6 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-check -> deblob-check-5.6 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/patch-5.6.17-rt10.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.17-rt10.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
index 744610b3c8b1..2f70de0e6030 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.40 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.40.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
index ce5116bfd5f6..56cb998e289c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.46 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.46.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
index 044c4d7f4e09..af0f8121a61c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.47 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.47.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48
index 5e1093dcd3fa..65cc37718729 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.48 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.48
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.48.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.49 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.49
index 3fcbf585c890..22c11efe324a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.49
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.49
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.49 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.49
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.49.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
index 21f519d1621b..62fce2d3f294 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b67a2931ace6e1a590f8f352b2827b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
index 553b84cabe17..416cd66ca5df 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.19.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b67a2931ace6e1a590f8f352b2827b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
index 96421964e847..54d5fa145852 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.4.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b889b56bb362bbcd7e81876103820285
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5
index b6e6abc34b01..b346e8befa5b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.5
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.5.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b889b56bb362bbcd7e81876103820285
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.6 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.6
index ca1f10d029a5..72f453ed6e8f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.6
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.6
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.6.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=39802f4425f0fc50dd8040ad30cfdd001bd2b40b -> linux-5.7.6-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	115b4cf0295609e0625636d8c6d9840e	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=183b2227c7e42ffa4a2127b11457a89a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.85 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.85
index fb3d024ad560..e251268127a7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.85
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.85
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.16.85
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.16.85.xz https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.186 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.186
index fbdd76d735dd..5b7e289f47c5 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.186
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.186
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.186
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.186.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.130 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.130
index bbe272c39eaa..e1e1ce2e419a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.130
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.130
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.130
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.130.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.228 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.228
index 6ee78861a3c0..30c94f19f7ef 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.228
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.228
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.228
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.228.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.228 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.228
index 9c5230e2e0ad..e7daf71405a1 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.228
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.228
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.228
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.228.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
index a2c4f1a4157f..2a1c7671d4af 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.49
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.49.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
index ff2820594c75..9f4ed042ae46 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.6.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index 83681e3209b1..3a49c66fd862 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.16.26.xz https://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5668a47c58461eb3e14a3d6890f51dda
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.4.15 b/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
index deb423bb9513..43afd75ed2a3 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.15
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.4.15-zen1/v5.4.15-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.6.15 b/metadata/md5-cache/sys-kernel/zen-sources-5.6.15
index 625e51effe60..046a562446cd 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.6.15
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.6.15
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.15
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.6.15-zen2/v5.6.15-zen2.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=795a8c647ba844c34a45c032f11b923c
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.7.5 b/metadata/md5-cache/sys-kernel/zen-sources-5.7.5
index 01007ba55dfe..1d578fe4af98 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.7.5
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.7.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.7.5-zen1/v5.7.5-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0ede8e3d16c5..2a81368fd002 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
index e101fd1a715a..0cd47cc6a7b0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95f7e4b29edbc5b69b909e5dc4031e69
+_md5_=2a185fd9d4296a0cbfd3aa111c0605e9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc2
new file mode 100644
index 000000000000..36cb3129a550
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc2
@@ -0,0 +1,13 @@
+BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.1*:10 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=10.0.1
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01fbe8c55e93e332661d01b00bd429a6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
index 95b6d1f317c9..fbada7e510cf 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c2d1f8fdff29e4d538b3966ffc47281
+_md5_=36606f7c1c227fdc1b83898896f38402
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc2
new file mode 100644
index 000000000000..e1da7f0a4786
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.9 >=dev-python/lit-5[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.1*:10 sys-libs/compiler-rt:10.0.1 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=10.0.1
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c68d63d9eac29fd8837e9a3cf96906d
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.0 b/metadata/md5-cache/sys-libs/libcxx-10.0.0
index f7e94f43c088..a706a9420497 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=7
 HOMEPAGE=https://libcxx.llvm.org/
 IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.0[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=libunwind? ( libcxxabi )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ba0dd72d7d2aab984c91394ed7b8b5d
+_md5_=34724eb54f43b3e6b74ef697efecb524
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.1_rc2 b/metadata/md5-cache/sys-libs/libcxx-10.0.1_rc2
new file mode 100644
index 000000000000..29083f97e6e7
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.1_rc2[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=7
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.1_rc2[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8bd15da29f60338565fcbeeb3e1d5ed1
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
index 41b56a4e9df9..888cbe8221fc 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Low level support for a standard C++ library
 EAPI=7
 HOMEPAGE=https://libcxxabi.llvm.org/
 IUSE=+libunwind +static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebb7f288cf496d136fd67a3012657fc2
+_md5_=fbb99c46b2dd7ce9c245263a14a4fa48
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1_rc2 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1_rc2
new file mode 100644
index 000000000000..650c48ad6365
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind +static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eef38ce30ecaa44fc38aec1f57aa09fa
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0 b/metadata/md5-cache/sys-libs/libomp-10.0.0
index 64d175b4e732..c29660f6eec9 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=7
 HOMEPAGE=https://openmp.llvm.org
 IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aaee34a6f5cca992db3b1d3019d8833a
+_md5_=125d0d09ef39eb6b7f2e203e788e1aa6
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1_rc2 b/metadata/md5-cache/sys-libs/libomp-10.0.1_rc2
new file mode 100644
index 000000000000..5a46d2fd51de
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=7
+HOMEPAGE=https://openmp.llvm.org
+IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
index d6339574324e..f07fd281c117 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=7
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
 IUSE=debug +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3a207bb7a8dc9408b9f14d3b926bba2
+_md5_=5cb4953f510a829e88c8b6bf2a29010b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc2 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc2
new file mode 100644
index 000000000000..7e310d325782
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=7
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=951167aaf4e6d60b7f809e007a00a2f8
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index c67f373980ad..7dfd54dc0dad 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4 b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4
new file mode 100644
index 000000000000..51d325a8ccf9
--- /dev/null
+++ b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Module for Tuxedo WMI
+EAPI=7
+HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-cc-wmi
+IUSE=kernel_linux kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://github.com/tuxedocomputers/tuxedo-cc-wmi/archive/v0.1.4.tar.gz -> tuxedo-cc-wmi-0.1.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=65b5a252d056a3037234f1c5c20d833b
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index d85e0550f05b..b489e3f5d644 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/lsof-4.93.2-r1 b/metadata/md5-cache/sys-process/lsof-4.93.2-r1
index 8fb249c811b7..01365dafefb8 100644
--- a/metadata/md5-cache/sys-process/lsof-4.93.2-r1
+++ b/metadata/md5-cache/sys-process/lsof-4.93.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Lists open files for running Unix processes
 EAPI=7
 HOMEPAGE=https://github.com/lsof-org/lsof
 IUSE=examples ipv6 rpc selinux
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=https://github.com/lsof-org/lsof/archive/4.93.2.tar.gz -> lsof-4.93.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4bc0deb5ee6e3c27ad681b4fbc4d91c2
+_md5_=1001af4cd6a1660b8c432f19c7ea6c5a
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index dc1a64476256..465471e1735b 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.816 b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.816
index 387adf9f65eb..c06a9dcfd31e 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.816
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.816
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt
 EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Math-BigInt-1.999.816 ) dev-lang/perl:= !<perl-core/Math-BigInt-1.999.816 !>perl-core/Math-BigInt-1.999.816-r999
 SLOT=0
-_md5_=4cdf987097a4c925da1b23b331ecadbd
+_md5_=2d151768f37aaa411ac9c24c41b96948
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.330.0 b/metadata/md5-cache/virtual/perl-Time-Piece-1.330.0
index e50a157e63c2..918fb37f8437 100644
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.330.0
+++ b/metadata/md5-cache/virtual/perl-Time-Piece-1.330.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-Piece
 EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~x64-cygwin ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Time-Piece-1.330.0 ) dev-lang/perl:= !<perl-core/Time-Piece-1.330.0 !>perl-core/Time-Piece-1.330.0-r999
 SLOT=0
-_md5_=95a81d290eda46df2d6970fb79a025a1
+_md5_=ccc372ed3b7355a43fcd2e9b789d1e74
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 2a6bf4f2c40d..2cdb2efbe94b 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/nikola-8.1.0 b/metadata/md5-cache/www-apps/nikola-8.1.0
new file mode 100644
index 000000000000..84dbb69fa13a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nikola-8.1.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/docutils-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=A static website and blog generator
+EAPI=7
+HOMEPAGE=https://getnikola.com/
+IUSE=assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 CC0-1.0 public-domain
+RDEPEND=>=dev-python/docutils-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/Babel-2.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/blinker-1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/doit-0.32[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/lxml-3.3.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mako-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/markdown-3.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/natsort-3.5.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/piexif-1.0.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pygments-1.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/unidecode-0.04.16[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/yapsy-1.11.223[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] assets? ( >=dev-python/webassets-0.10.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) charts? ( >=dev-python/pygal-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ghpages? ( >=dev-vcs/ghp-import-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hyphenation? ( >=dev-python/pyphen-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ipython? ( >=dev-python/ipython-2.0.0[notebook,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jinja? ( >=dev-python/jinja-2.7.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) watchdog? ( >=dev-python/watchdog-0.8.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) webmedia? ( >=dev-python/micawber-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) websocket? ( ~dev-python/ws4py-0.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/N/Nikola/Nikola-8.1.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8fb9831e997f01c1ecbe2537ca681129
diff --git a/metadata/md5-cache/www-apps/radicale-2.1.11-r1 b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
index ce2ed354dbb1..bee00056ccda 100644
--- a/metadata/md5-cache/www-apps/radicale-2.1.11-r1
+++ b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/pkgconfig
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
 DESCRIPTION=A simple CalDAV calendar server
 EAPI=6
 HOMEPAGE=https://radicale.org/
-IUSE=+bcrypt python_targets_python3_6
+IUSE=+bcrypt python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
-RDEPEND=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.7.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] bcrypt? ( dev-python/passlib[bcrypt,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] bcrypt? ( dev-python/passlib[bcrypt,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-2.1.11.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39ab33a10988d505849d8d3bc622976c
+_md5_=cb9ed8e0871c5ca463a2e4d9a7e9dc1c
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index b645a29ad72a..778bb78b4414 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-85.0.4181.8 b/metadata/md5-cache/www-client/chromium-85.0.4181.8
new file mode 100644
index 000000000000..fdcdd3f82290
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-85.0.4181.8
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1726 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:= system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !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/gtk+:3[wayland?,X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=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] x11-libs/libXScrnSaver:= 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:= ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.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 ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc 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:= system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !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/gtk+:3[wayland?,X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=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] x11-libs/libXScrnSaver:= 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-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+REQUIRED_USE=component-build? ( !suid ) wayland? ( ozone )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4181.8.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-85-patchset-1/chromium-85-patchset-1.tar.xz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=115475d8563b74596405fe362ebd49ff
diff --git a/metadata/md5-cache/www-client/netsurf-3.10 b/metadata/md5-cache/www-client/netsurf-3.10-r1
similarity index 93%
rename from metadata/md5-cache/www-client/netsurf-3.10
rename to metadata/md5-cache/www-client/netsurf-3.10-r1
index 6ee47ce3fd96..c804aad0c31e 100644
--- a/metadata/md5-cache/www-client/netsurf-3.10
+++ b/metadata/md5-cache/www-client/netsurf-3.10-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.netsurf-browser.org/
 IUSE=bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng +png +psl rosprite +svg +svgtiny +webp
 KEYWORDS=~amd64
 LICENSE=GPL-2 MIT
-RDEPEND=>=dev-libs/libcss-0.9 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.0.5 >=dev-libs/libutf8proc-2.2 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.7 duktape? ( dev-lang/duktape ) !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
+RDEPEND=>=dev-libs/libcss-0.9 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.0.5 >=dev-libs/libutf8proc-2.4 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.7 duktape? ( dev-lang/duktape ) !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
 REQUIRED_USE=|| ( fbcon gtk gtk2 ) duktape? ( javascript )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.10-src.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b68feb80a172783360c7ec6a5981b8b8
+_md5_=38742d93535502e0d121149c2a049047
diff --git a/metadata/md5-cache/www-client/opera-developer-71.0.3735.0 b/metadata/md5-cache/www-client/opera-developer-71.0.3735.0
new file mode 100644
index 000000000000..7041a2dae647
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-71.0.3735.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus 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/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/71.0.3735.0/linux/opera-developer_71.0.3735.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/71.0.3735.0/linux/opera-developer_71.0.3735.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/71.0.3735.0/linux/opera-developer_71.0.3735.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/71.0.3735.0/linux/opera-developer_71.0.3735.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 5e5bb336c72b..767c063f1a5f 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
index 852d888ea7fa..d397e3e85eb4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.108/NVIDIA-FreeBSD-x86_64-340.108.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/340.108/NVIDIA-FreeBSD-x86-340.108.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/340.108/NVIDIA-Linux-x86-340.108.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=b45afef7777f84d142b123fc0000d0cd
+_md5_=028eb4f7fafadb0e43dfc5f9967f0e4f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
index cde3cc296982..aa53deb952ee 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=9663ee26452ea78504812bafea5230a2
+_md5_=f163cb71e0138dcf1341f9eafa3537c8
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
index b547857e8de3..a2fafde2a044 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=29e62c76fb096ea5cf6514ddad9e2166
+_md5_=cd4c4c19d9b41c2881a573cf37db3eb4
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
index 6cfc74cc61b0..bbe2d25d32eb 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.138/NVIDIA-FreeBSD-x86_64-390.138.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.138/NVIDIA-Linux-armv7l-gnueabihf-390.138.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.138/NVIDIA-FreeBSD-x86-390.138.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=e2f39c55cddb5b8b36a06affba4f4b51
+_md5_=4b3b4e9ef8d7fd2a1701a830596d9ecf
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
index 5e72f9cc8315..e6cf3db28dec 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/430
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/430.64/NVIDIA-FreeBSD-x86_64-430.64.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/430.64/NVIDIA-Linux-x86_64-430.64.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.64.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=1ca4c002f3124c3ac7fe7c9e29b53e60
+_md5_=7dee2d175cd7f31d8133363451664a6e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
index d7cfd9cde254..8a2b551abeb6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/435
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=cb46dbef9f8e58a92fdc8ef1b32d27c3
+_md5_=d361a43e233c8497daeecf4e655bc850
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
index b273ad1550c0..842c7b1ce90b 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/440
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.100/NVIDIA-FreeBSD-x86_64-440.100.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=26e04de5ef52e67504d27943f0c10e7c
+_md5_=a900cf3349fc91566312218fbdc6f692
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
index ecb2e1c48a45..67886cb7b371 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/450
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.51/NVIDIA-FreeBSD-x86_64-450.51.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.51/NVIDIA-Linux-x86_64-450.51.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.51.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=306e1d43f28ba1bc1c25fd737e271750
+_md5_=32e1b0b3ae15120420837501a94a2618
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 783641aa5882..76428d5eb983 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.20 b/metadata/md5-cache/x11-libs/gtk+-3.24.20
index b3b60acff56d..37914dc1d41a 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.20
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.20
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.57.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.41.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.14.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.14 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.20.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d688cecd876e3e1613129d2e13dd6217
+_md5_=378f7a907ee21da8b03aac72efa8a734
diff --git a/metadata/md5-cache/x11-libs/gtk+extra-3.3.4 b/metadata/md5-cache/x11-libs/gtk+extra-3.3.4
index a470d1f179e7..696b2b2bd82b 100644
--- a/metadata/md5-cache/x11-libs/gtk+extra-3.3.4
+++ b/metadata/md5-cache/x11-libs/gtk+extra-3.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Additional GTK+ widgets
 EAPI=6
 HOMEPAGE=http://gtkextra.sourceforge.net
 IUSE=+introspection static-libs test
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=FDL-1.1 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkextra/gtkextra-3.3.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=feb78e241a983d582ce49141b7c534b1
+_md5_=67d4ffbd4a4214ba4d85f10623d03c7f
diff --git a/metadata/md5-cache/x11-libs/qwt-6.1.3-r2 b/metadata/md5-cache/x11-libs/qwt-6.1.3-r2
deleted file mode 100644
index 986d53eaf36f..000000000000
--- a/metadata/md5-cache/x11-libs/qwt-6.1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 )
-DESCRIPTION=2D plotting library for Qt5
-EAPI=7
-HOMEPAGE=https://qwt.sourceforge.net/
-IUSE=designer doc examples mathml opengl static-libs svg
-KEYWORDS=amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 ) !<x11-libs/qwt-5.2.3 !x11-libs/qwt:5[doc] doc? ( !<media-libs/coin-3.1.3[doc] )
-SLOT=6/1.3
-SRC_URI=mirror://sourceforge/project/qwt/qwt/6.1.3/qwt-6.1.3.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3757af4c8599f28554513d41131131db
diff --git a/metadata/md5-cache/x11-libs/qwt-6.1.4 b/metadata/md5-cache/x11-libs/qwt-6.1.4
index 4ac8fae18962..fb666decd56a 100644
--- a/metadata/md5-cache/x11-libs/qwt-6.1.4
+++ b/metadata/md5-cache/x11-libs/qwt-6.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=2D plotting library for Qt5
 EAPI=7
 HOMEPAGE=https://qwt.sourceforge.net/
 IUSE=designer doc examples mathml opengl svg
-KEYWORDS=amd64 ~arm ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 )
 SLOT=6/1.4
 SRC_URI=mirror://sourceforge/project/qwt/qwt/6.1.4/qwt-6.1.4.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=96897e6a3c3093a6cd046ea4da97e4d5
+_md5_=0c394f78548025ef0b88de679b2ca71f
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 14019e7757c4..ae4200826569 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/alacarte-3.36.0 b/metadata/md5-cache/x11-misc/alacarte-3.36.0
index 50cca788e44c..92305eb24b09 100644
--- a/metadata/md5-cache/x11-misc/alacarte-3.36.0
+++ b/metadata/md5-cache/x11-misc/alacarte-3.36.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simple GNOME menu editor
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/alacarte
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=gnome-base/gnome-menus-3.5.3:3[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection]
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/alacarte/3.36/alacarte-3.36.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5eb0d12c01eb6075a4a354191a7ab62
+_md5_=a4babcc173c1d25aa8b907f81a0f49b0
diff --git a/metadata/md5-cache/x11-misc/projecteur-0.7-r2 b/metadata/md5-cache/x11-misc/projecteur-0.7-r2
index 1ec276da7a27..c8874039eb33 100644
--- a/metadata/md5-cache/x11-misc/projecteur-0.7-r2
+++ b/metadata/md5-cache/x11-misc/projecteur-0.7-r2
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/q
 DESCRIPTION=Linux Desktop Application for the Logitech Spotlight device
 EAPI=7
 HOMEPAGE=https://github.com/jahnf/Projecteur
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.7.tar.gz -> projecteur-0.7.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d0952c0d8a2cf5d9a558006c6f9973a
+_md5_=d56bf57988c71c179ad058574140e479
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2 b/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
index bce45cfb4a4e..2c1f401cdfea 100644
--- a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
+++ b/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
@@ -3,9 +3,9 @@ DEPEND=dev-util/patchutils
 DESCRIPTION=Run a command in a virtual X server environment
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/xvfb
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_1.20.8-2.diff.gz
-_md5_=a275dbe868ce3aabff34ded1d09b84bb
+_md5_=538ef126b2cee3cd2e5b2832d6b8e9c1
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 3546bd83980a..8363a0d01041 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/i3-4.18.1 b/metadata/md5-cache/x11-wm/i3-4.18.1
index 1efca64df3dc..fef22df54ffc 100644
--- a/metadata/md5-cache/x11-wm/i3-4.18.1
+++ b/metadata/md5-cache/x11-wm/i3-4.18.1
@@ -5,7 +5,7 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=7
 HOMEPAGE=https://i3wm.org/
 IUSE=doc debug test test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-libs/cairo[X,xcb(+)] x11-libs/pango[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 REQUIRED_USE=test? ( debug )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.18.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=5e9ad2d2a26f2e82288d1c0ae3ed34c9
+_md5_=06b0d93f4c25b1da0fdeb8ab2c364932
diff --git a/metadata/md5-cache/x11-wm/mutter-3.34.6-r1 b/metadata/md5-cache/x11-wm/mutter-3.34.6-r1
index 550651eff054..e73fa83a9c53 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.34.6-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.34.6-r1
@@ -5,7 +5,7 @@ DESCRIPTION=GNOME 3 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 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] >=dev-libs/glib-2.61.1: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 media-libs/mesa[X(+),egl] wayland? ( >=dev-libs/wayland-protocols-1.18 >=dev-libs/wayland-1.13.0 x11-libs/libdrm:= >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.4 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[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.2.2:0/0.2 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://gnome/sources/mutter/3.34/mutter-3.34.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=140340bf6386aad3df0ed5f2f066b11c
+_md5_=230c1f172526d791b04c4cb339c5ae0e
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 5ab4ec575c41..22e82df4edc3 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.14.4 b/metadata/md5-cache/xfce-base/xfce4-panel-4.14.4
index 67d09b58c7db..0354cc5c66df 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.14.4
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.14.4
@@ -5,7 +5,7 @@ DESCRIPTION=Panel for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=+gtk2 introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= gtk2? ( >=x11-libs/gtk+-2.20:2 ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!gtk2? ( test )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.14/xfce4-panel-4.14.4.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ac1bdc36023b1c0868405bc7c9e300f
+_md5_=93f7cadee60746cb08c6f2d84b9ab020
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.14.2 b/metadata/md5-cache/xfce-base/xfce4-session-4.14.2
index caf40a96a0b2..508e5ca7f980 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.14.2
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.14.2
@@ -4,10 +4,10 @@ DESCRIPTION=A session manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start
 IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=x11-apps/iceauth >=dev-libs/glib-2.42 >=x11-libs/gtk+-3.22:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.14/xfce4-session-4.14.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=107cae361f21061fefeea2f77d7bbc0e
+_md5_=6b9adce504d0a9e83daa3e9d2c6ccb15
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.14.3 b/metadata/md5-cache/xfce-base/xfce4-settings-4.14.3
index 967e8d2e81ce..d03da8e1ea06 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.14.3
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.14.3
@@ -4,10 +4,10 @@ DESCRIPTION=Configuration system for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier
-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=GPL-2+
 RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.14/xfce4-settings-4.14.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbd27e73cd7071e7df13a3f60e9a4d63
+_md5_=b8d499caa73b1a03b5abc11add99d809
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index f5de3da76540..ebce76ca7ab7 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/thunar-shares-plugin-0.3.1 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
index 7792bffcc257..dc5f7df84c8d 100644
--- a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
+++ b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-3.22:3 >=xfce-base/thunar-1.7:= dev-
 DESCRIPTION=Thunar plugin to share files using Samba
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-3.22:3 >=xfce-base/thunar-1.7:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/0.3/thunar-shares-plugin-0.3.1.tar.bz2
-_md5_=bd788b7411551f1678253d123a460a33
+_md5_=779aaeed03777ffc2e76435590c428b8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.1 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.1
index 8cc680df4c3f..1bdfcddeb99e 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=A clipboard manager plug-in for the Xfce panel
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
 IUSE=qrcode
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.14:3= x11-libs/libXtst:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= qrcode? ( >=media-gfx/qrencode-3.3.0:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.6/xfce4-clipman-plugin-1.6.1.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e679686468c4e9835020bc3cc7d5db99
+_md5_=d93b4b318f9cccf3f40cb9f519ccb331
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.1 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.1
index 86eb94f223be..807adbaa08cb 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:
 DESCRIPTION=Notification daemon for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.1.tar.bz2 -> xfce4-notifyd-0.6.1-r1.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=639c93306cd06d3f0743d0ddcf8c4dc0
+_md5_=e382016075738fe3f7e21f7000c033f9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
index 790cf5459576..f8d459aad675 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=A panel plug-in for PulseAudio volume control
 EAPI=7
 HOMEPAGE=https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
 IUSE=debug keybinder libnotify wnck
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=307c01b0d50ee7adf8caa450d8c12939
+_md5_=f46a6e94819c25716af93fc64312e3fe
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.3 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.3
index 177e4b353757..225721153d35 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= x11-libs/gtk+:3= x11
 DESCRIPTION=Easy to use task manager
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= x11-libs/gtk+:3= x11-libs/libwnck:3=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-1.2.3.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=244c2582a6e842bf0f89e6d7901439e6
+_md5_=ad7f8e7044d5d40184dfcf69413ece52
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4
index c7ae5e3a21fe..2ed0e05fbd72 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4
@@ -4,10 +4,10 @@ DEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-b
 DESCRIPTION=Alternate application launcher for Xfce
 EAPI=7
 HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin/
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.4/xfce4-whiskermenu-plugin-2.4.4.tar.bz2
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0ddb23bd8c27c21f85fa78d7213ee4c
+_md5_=f93d2174ab9b6409c88a2c2d48af8b76
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fc40224816f6..c2a92d634d28 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Jun 2020 05:08:22 +0000
+Mon, 29 Jun 2020 21:38:22 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f1d8a32dc9f6..846252039781 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon 29 Jun 2020 05:08:22 AM UTC
+Mon 29 Jun 2020 09:38:22 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 15396c412687..9b4cd4459f1a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Jun 2020 05:30:01 +0000
+Mon, 29 Jun 2020 22:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ce69a5aab6e0..2a589a29c387 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9443e690c0dd880eadc408072fb9520ef032757c 1593406746 2020-06-29T04:59:06+00:00
+35467927a9574c97b524e20c020149ab92494e16 1593466164 2020-06-29T21:29:24+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a50bf132efc4..31ddd50a7630 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1593407101 Mon 29 Jun 2020 05:05:01 AM UTC
+1593466501 Mon 29 Jun 2020 09:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fc40224816f6..c2a92d634d28 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Jun 2020 05:08:22 +0000
+Mon, 29 Jun 2020 21:38:22 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f247ccda2901..8b7632f6c2ce 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index de03725a103a..efc2f9ca72a3 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,3 +1 @@
-DIST etherape-0.9.14.tar.gz 1438255 BLAKE2B a34ca77cc8862b3de50ca0405d7de083653fb984de85feb7c575b6eb0f340d386add9c851cdd54d8cf5d3d1c3cdddb1c7522673687d94b30f2ab0f91d4251613 SHA512 26e018e49bbea9baf8b4056798e2acab1ad1aba51022ab1258d31499d612a7b12567c4d671da45f79785fbe3c1eda6698b4fe201b055e71e13c9f9b0275c91e3
-DIST etherape-0.9.18.tar.gz 1436265 BLAKE2B b9f3fd625369fdf6790bef75cc97effd3e1a6eec0635472752daf420c890d4a5231bd1baff6ee58937ad27e1d96eaae5b79cc2f9a2b6eeeb7c957d08cbc8f667 SHA512 0ed19966451f9e9b5f5754018d485e7dc59005657ceddf8a75e790c4b7fbf3c8eea56354cf490ec27e18c4bc14c5b3fe648c90facc471dfb14b52ea68abc37d3
 DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e
diff --git a/net-analyzer/etherape/etherape-0.9.14.ebuild b/net-analyzer/etherape/etherape-0.9.14.ebuild
deleted file mode 100644
index bc2c11074e7a..000000000000
--- a/net-analyzer/etherape/etherape-0.9.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
-HOMEPAGE="http://etherape.sourceforge.net/"
-SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	gnome-base/libgnomecanvas[glade]
-	net-libs/libpcap
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.11.5
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	virtual/pkgconfig
-"
diff --git a/net-analyzer/etherape/etherape-0.9.18.ebuild b/net-analyzer/etherape/etherape-0.9.18.ebuild
deleted file mode 100644
index 1cfcbd672427..000000000000
--- a/net-analyzer/etherape/etherape-0.9.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
-HOMEPAGE="http://etherape.sourceforge.net/"
-SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/popt
-	net-libs/libpcap
-	x11-libs/goocanvas:2.0
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/gettext-0.11.5
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	virtual/pkgconfig
-"
diff --git a/net-analyzer/etherape/etherape-0.9.19.ebuild b/net-analyzer/etherape/etherape-0.9.19.ebuild
index dbe8b6a2a0f0..115dc5bb3c88 100644
--- a/net-analyzer/etherape/etherape-0.9.19.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 45cfa5909682..a6c59d84b53b 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 159a426de51f..e9b1f3358810 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,2 +1,3 @@
 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
 DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
+DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
diff --git a/net-dns/bind-tools/bind-tools-9.16.4.ebuild b/net-dns/bind-tools/bind-tools-9.16.4.ebuild
new file mode 100644
index 000000000000..ce5dd685f2f6
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+	dev-libs/libuv:=
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)"
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index db674b837c46..e16303da1b8c 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,4 @@
 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
 DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
+DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
diff --git a/net-dns/bind/bind-9.16.4.ebuild b/net-dns/bind/bind-9.16.4.ebuild
new file mode 100644
index 000000000000..b7801db811dc
--- /dev/null
+++ b/net-dns/bind/bind-9.16.4.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# -berkdb by default re bug 602682
+IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs
+urandom xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="
+	?? ( geoip geoip2 )
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( >=dev-libs/geoip-1.4.6 )
+	geoip2? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:="
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
+RESTRICT="test"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl"
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${EPREFIX}"/usr
+		--without-cmocka
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		# $(use_enable static-libs static)
+		$(use_with berkdb dlz-bdb)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with python)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	use geoip && myeconfargs+=( --enable-geoip )
+	use geoip2 && myeconfargs+=( --with-maxminddb )
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r13 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use python; then
+		install_python_tools() {
+			dosbin bin/python/dnssec-{checkds,coverage}
+		}
+		python_foreach_impl install_python_tools
+
+		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
+		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
+	fi
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn}
+
+	dodir /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	systemd_dotmpfilesd "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9 || die
+		chmod 0666 ${CHROOT}/dev/urandom || die
+	else
+		mknod ${CHROOT}/dev/random c 1 8 || die
+		chmod 0666 ${CHROOT}/dev/random || die
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml
index 08d29c2b89ac..1989b4903ef9 100644
--- a/net-dns/maradns/metadata.xml
+++ b/net-dns/maradns/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <maintainer type="person">
+        <email>slashbeast@gentoo.org</email>
+        <name>Piotr Karbowski</name>
+    </maintainer>
     <maintainer type="person">
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 9d70d31bc958..b3476f59931d 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 60416d51e986..27379e5ff7cd 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,14 @@
 DIST shorewall-5.2.5.1.tar.bz2 582482 BLAKE2B 6ee3c5a6dc80e9b42ced41eaab36c9ee4fc9f2c6853a17a7dc85f162a8abfdfed2ccd3cec73e1101ea9aa6ce9b773aa76be5c00310dd73b130121b0de73ba77a SHA512 9313bf2effe4572d8898df5d55c461bddbc5d54bec5679af31c02cc494ecff06824d1d46d604078184bdabd7c08be07f30bf81bef2c8d19f03aac99b3525bf6f
-DIST shorewall-5.2.5.tar.bz2 582270 BLAKE2B 6b0e883dd424ec814fb5f2dac601bd4e896c97c73ed0f2a151a054bd4b3db732aeaeb158d5bc453ca7cf3723233e429aa24f0b9908787f384e69da656fd71832 SHA512 6527fae5067bbfedd4d1fe53fb1b110fbac3f6d7f3b1abfe76be373ebb345bc238dabf3f24a8883314bf29ffc847dcd190bddc82ca64183311ba0e5544078743
+DIST shorewall-5.2.5.2.tar.bz2 582902 BLAKE2B 7065133a2995de061912974270a0eabce904dd6950db3086a6381eea4ee86c8da54e948e50e50ff3f26d99403c6626b826bf09d7866c5cd832b3949b3445c304 SHA512 81e2ca66a86a857919e4b9502fde95630ca4109f8c67bbeb97b3a9a66cef734250f472a7b6503c25408ae7e71e96479af6911a75038135a9d5099db1b782ffa4
 DIST shorewall-core-5.2.5.1.tar.bz2 74648 BLAKE2B f00f2a4302361e557fbfae2fe6bfd5e82d47751a86c1ac6ebf729ead6fbe08386f570dde5ef18917ccd48d8a9a97ec467dde34fda93cde5e3d8e15977bdcfbb1 SHA512 3f1f85f388b17f6fa02fe54bbb28bf7bd36b97b14557891644caffcea11eb167a0df91964525b706f2b5eee9d8f325471f5038f6636308e4c99e8818928fdc75
-DIST shorewall-core-5.2.5.tar.bz2 74420 BLAKE2B ff2a6c2ead74f125785bcb2aea42948f27b88cb39d121a3ab1af1e4df6dc4ec878854499be7c385766af6245f4590c62b4dd2eb3d648b02fa4f16d3e13a302ce SHA512 9bd7e74def89cdc07987cbcbf9b8d8a69500f7b0dfc346c9fbcec6ab8cecad3c2adfcc505136ef0c2f0525345fdb6de4918dd5bd2d382bfb4773b23ce868a937
+DIST shorewall-core-5.2.5.2.tar.bz2 74903 BLAKE2B 12fb7f3912a315eb18c17d74d60edaf764c62a80e568bc4ddd25f6dbb3cb7b7dae1694897d11bce6d2c848c4aa71843003d0880998a7686944752748b9b59707 SHA512 78941ddbf73dd26be12383bf95c43a520bfcbfbeb88bb5fce04eacf223038edb39405c7a0d37a2cfc4eeb60bb9516903220c82a0fdf4ba4501ffd5c8a6201a06
 DIST shorewall-docs-html-5.2.5.1.tar.bz2 4310025 BLAKE2B 4ab4907eade322ec3e9e78d4c1c3c51a86f31fd8f4497d01ba0cfdeddf0294f240307f0d228b923b99d9b0f1b7444046a60a36569c04ef8d9f88043277c89bdc SHA512 a24f6dabed9a7ae9622c9a1f5be323a6c4cb7a8a5a671be3f0bb12d8d0b20ee11c8c11b3f1e8aac49a04a50f2bac6f137524b0e6edf9483a67b1eb44b3997094
-DIST shorewall-docs-html-5.2.5.tar.bz2 4310021 BLAKE2B 2d5704f126f6626bf2c934390552c19190fac5fd4231aaf61a2b0eadd770cad7b220d1083df2b0ab26ce8b2c1d97f5a3b0f2b083d14d3c5ce800bb6402603216 SHA512 04ae753f25371c0ce08af2cac5abd19797ec70860714e6891900a45baab0fb24d0f7c3163a5d2f5e419f1c1a8b092c164b7230b8d0c8cc4c3f53bbd0269e419b
+DIST shorewall-docs-html-5.2.5.2.tar.bz2 4310164 BLAKE2B e02def5b187e66aa55125123d6e532e9f4c8bd442b590b5cf6aba41bb6da96146dbda41743341682a07d425ca46fe2ee4b6f6334b47c4ee5a75781ffb8788478 SHA512 78b35e58ad1517477c5210d2df230279f9bf6b3f6a904ee2fd3f7b354dcdb0d0f685d28868a0a9f7b0b78b8f8f4e00aa171e1f181b45836f7c45876270d0c09c
 DIST shorewall-init-5.2.5.1.tar.bz2 39639 BLAKE2B 8c815c7ebb78c0a85cb2aac9b36e6a232c01f5ecb1fb17dd4d6b76c08746861e4e599213e553f7e2894093dc9722d61120f6f0179eda4b38fa93df4989589934 SHA512 d502b7262587b6546071083bb535f97606316c8ce592b01fe875d90b141833c9488750f864233614237b1e9412206c104f54052d7e20ff2067be8eb78acdb72b
-DIST shorewall-init-5.2.5.tar.bz2 39405 BLAKE2B 8259b4618c3b75201e245fd414da7890a80d31535eea71358f9ed3bc9b44ad0e341c3b795f624ac8cb05e2345fac82a8831ad877abe6a9ef13a8c7889bfdcb7e SHA512 61f31287472770fe02a099bddd7a6a5fa42fb676462cb7b16975fb15c6a70fe1fbb40d4c1b714f9e8a1a4bdc0ef3d7542552b1dd780833be781dda1e8dba9879
+DIST shorewall-init-5.2.5.2.tar.bz2 39779 BLAKE2B b8857e93120bf435419744a277bafdec5b4652ed8009aa915c170b5a1bf385b9b1d8fbc2a884791940304b76316c0e43ee38c2cf4fb2c2c80feca11ecf55426a SHA512 7363752b363d3fc94f51524a730c94dffadad65be39bb258e0b50ff11a880cae25e99975e8abc85394616afa09c29213578861d6723d70f7c87a80b57cabe14b
 DIST shorewall-lite-5.2.5.1.tar.bz2 44367 BLAKE2B 2b6f013fd13e895ac104e277eaf8abedec6a2a3f57a50becb2bce752fd0f9c679110d84634aa82a22bbc9ae2ce2ab9f9dc06a1220cb0f6949cc5da2d59524137 SHA512 6bcd0dfeddaf2bc513610cbecbe16574f2ed65958e8455d83f99486b286bd98ae9fba539b90c2a308d62b7a0eb8526e7af8ef3d0190f3e5ffcb660b3cdd3c769
-DIST shorewall-lite-5.2.5.tar.bz2 44120 BLAKE2B 47154b9f7203f5bff279c2e936dd0fe108bcb44bc9dd43abb49dc0c129a54ea381fff71b1dc3ac55e026b4065d8d5ab48edb1dcf52845e5e5f88492a958f4451 SHA512 41e6de25b2b10452bd15c465df5ffaf21019059f511197a6d398af086bba55f80b21b6644747fb2c228414a1e8af381ef5c4174b8e4defc72389664e971a85d3
+DIST shorewall-lite-5.2.5.2.tar.bz2 44483 BLAKE2B 7c6c8a96efa1591738f5eea027ddc2614a03c77cd0f7500e9ba3e40402afabc77a0814834c05e2a9943bc8f72a9b6115cf20fd02b04376d52e6ef644d90fbef8 SHA512 6a9a78085665911e1a88f7befcc1b667e4c60c5f0139b6d489fa78612cb17637806dcbfd141b15a83e7ea87ff69eb0af0a833cba8c7934993e101061b6cb8ca9
 DIST shorewall6-5.2.5.1.tar.bz2 201672 BLAKE2B 9759de6ddf0025175293f04b62ad7aa9c2a9a18d7d1e713fdcc9f859cbb1585207e8822988b91868d706698950cede5e03bc17c44a1983655fc809d330d3fb37 SHA512 c1168a609373b27db194a8eea2a934b7302fd4e3caa583d7527530426968ae5fc81510f2943a1ba1bb14c6edf7f50081841227f5aec337f5faaa54ff83f99b66
-DIST shorewall6-5.2.5.tar.bz2 201419 BLAKE2B efb1a81ee1bcee982d7cfd1bb5ee9cbae5e59e3ce47895d25332f71c1d79d2bb2421c6fca0645fe9d2d493648caab2b9c233d36fb9210e3fd6f667b89ff66671 SHA512 2b3656490209872c696966129bf4a411d050f561fd82645f494c503013a755854833cdbedfd6bdb971abb974988d11b1c4e29e62d431a4d67bba74822f579692
+DIST shorewall6-5.2.5.2.tar.bz2 202054 BLAKE2B ef7c5f7230ecb3f1961285a15c73ee08fcb4a79e1f55c62862e84fad1be711146b0ee9be1f7a41e5646817a080f654d3f1c2ee55ffa4a055c22ba14ad8f42211 SHA512 f54410bc2f299327a16f66039575c6c3a42fdbc0f2c51b881012f07a122228ee13029380c2f401d0873fae3dc51173cc759e6680353356e60c95c18cf87490fc
 DIST shorewall6-lite-5.2.5.1.tar.bz2 44252 BLAKE2B 5550703689ff513283ff0656b9f845741f454df4c49e54481316a5bfca5d630b02b45f67bf689ee417b8d411824b71beffde98f6aa2977d4ae6493c0eda2225c SHA512 e5696658195c6d4f4c0953af215fe35bbbcf76532fe572b2613f490716417b042755231db80885293514f21f1b29f8c44c0497df9a7ba7b2ad16431ea7cbe7d2
-DIST shorewall6-lite-5.2.5.tar.bz2 44064 BLAKE2B e4667d1f1c932980d7bea03059b0aae8f83f0f3557f4245cec21aafaae72a942d47a8a355d3581cc459f85a80c10cb16af1c6e08971be2d120644098543bb3af SHA512 0c61c489f79aa51178aa733e1e738a2921c598e9403884322ccbc90461be4ee18dd0225d758371f1c750cfc832ca63652bbd8cac831e2ea026d63b72202c6f2a
+DIST shorewall6-lite-5.2.5.2.tar.bz2 44447 BLAKE2B f216cbad432e589c7bfb0b68396c7a0ff8a711dc273910c0657b343202be08910b5d176c769f7fd0da22c4bcaabdb008f73ef9baa4681247fb8c9e0d0932bfe4 SHA512 ab00c53086cca681112603ad73fd8393e4b0b29e6997d6c85fe736481b05305f94af58a6dca31c715d064fc6daf6743b2a13abd7f78ea629158ec142062fb7e5
diff --git a/net-firewall/shorewall/shorewall-5.2.5.1.ebuild b/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
index 95a3c0906eab..c6f9c3e5bed0 100644
--- a/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-firewall/shorewall/shorewall-5.2.5.ebuild b/net-firewall/shorewall/shorewall-5.2.5.2.ebuild
similarity index 99%
rename from net-firewall/shorewall/shorewall-5.2.5.ebuild
rename to net-firewall/shorewall/shorewall-5.2.5.2.ebuild
index c6f9c3e5bed0..95a3c0906eab 100644
--- a/net-firewall/shorewall/shorewall-5.2.5.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.5.2.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 SRC_URI="
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index d7fb79ebf1cf..187fec5aa399 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/polari/polari-3.34.1.ebuild b/net-irc/polari/polari-3.34.1.ebuild
index 831b7b187876..dad3791fcd02 100644
--- a/net-irc/polari/polari-3.34.1.ebuild
+++ b/net-irc/polari/polari-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 514dce0dd396..5a3c9942340d 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index 477975337ae1..a9d24c470685 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
index 33084e2eef4a..1a095124653b 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 836e8ec1e80a..c7569e5d4778 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,2 +1 @@
-DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
 DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2018-20750.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2018-20750.patch
deleted file mode 100644
index 55f122d12584..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2018-20750.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Mon, 7 Jan 2019 10:40:01 +0100
-Subject: [PATCH 01/51] Limit lenght to INT_MAX bytes in
- rfbProcessFileTransferReadBuffer()
-
-This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap
-out-of-bound write access in rfbProcessFileTransferReadBuffer() when
-reading a transfered file content in a server. The former fix did not
-work on platforms with a 32-bit int type (expected by rfbReadExact()).
-
-CVE-2018-15127
-<https://github.com/LibVNC/libvncserver/issues/243>
-<https://github.com/LibVNC/libvncserver/issues/273>
----
- libvncserver/rfbserver.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
-index 7af8490..f2edbee 100644
---- a/libvncserver/rfbserver.c
-+++ b/libvncserver/rfbserver.c
-@@ -88,6 +88,8 @@
- #include <errno.h>
- /* strftime() */
- #include <time.h>
-+/* INT_MAX */
-+#include <limits.h>
- 
- #ifdef LIBVNCSERVER_WITH_WEBSOCKETS
- #include "rfbssl.h"
-@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length)
-        0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF
-        will safely be allocated since this check will never trigger and malloc() can digest length+1
-        without problems as length is a uint32_t.
-+       We also later pass length to rfbReadExact() that expects a signed int type and
-+       that might wrap on platforms with a 32-bit int type if length is bigger
-+       than 0X7FFFFFFF.
-     */
--    if(length == SIZE_MAX) {
-+    if(length == SIZE_MAX || length > INT_MAX) {
- 	rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length);
- 	rfbCloseClient(cl);
- 	return NULL;
--- 
-2.23.0
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15681.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15681.patch
deleted file mode 100644
index 301d1340d14c..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15681.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001
-From: Christian Beier <dontmind@freeshell.org>
-Date: Mon, 19 Aug 2019 22:32:25 +0200
-Subject: [PATCH 48/51] rfbserver: don't leak stack memory to the remote
-
-Thanks go to Pavel Cheremushkin of Kaspersky for reporting.
----
- libvncserver/rfbserver.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
-index 3bacc89..310e548 100644
---- a/libvncserver/rfbserver.c
-+++ b/libvncserver/rfbserver.c
-@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len)
-     rfbServerCutTextMsg sct;
-     rfbClientIteratorPtr iterator;
- 
-+    memset((char *)&sct, 0, sizeof(sct));
-+
-     iterator = rfbGetClientIterator(rfbScreen);
-     while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
-         sct.type = rfbServerCutText;
--- 
-2.23.0
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15690.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15690.patch
deleted file mode 100644
index 5ef290129c72..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15690.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 54220248886b5001fbbb9fa73c4e1a2cb9413fed Mon Sep 17 00:00:00 2001
-From: Christian Beier <dontmind@freeshell.org>
-Date: Sun, 17 Nov 2019 17:18:35 +0100
-Subject: [PATCH] libvncclient/cursor: limit width/height input values
-
-Avoids a possible heap overflow reported by Pavel Cheremushkin
-<Pavel.Cheremushkin@kaspersky.com>.
-
-re #275
----
- libvncclient/cursor.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libvncclient/cursor.c b/libvncclient/cursor.c
-index 67f4572..40ffb3b 100644
---- a/libvncclient/cursor.c
-+++ b/libvncclient/cursor.c
-@@ -28,6 +28,8 @@
- #define OPER_SAVE     0
- #define OPER_RESTORE  1
- 
-+#define MAX_CURSOR_SIZE 1024
-+
- #define RGB24_TO_PIXEL(bpp,r,g,b)                                       \
-    ((((uint##bpp##_t)(r) & 0xFF) * client->format.redMax + 127) / 255             \
-     << client->format.redShift |                                              \
-@@ -54,6 +56,9 @@ rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int h
-   if (width * height == 0)
-     return TRUE;
- 
-+  if (width >= MAX_CURSOR_SIZE || height >= MAX_CURSOR_SIZE)
-+    return FALSE;
-+
-   /* Allocate memory for pixel data and temporary mask data. */
-   if(client->rcSource)
-     free(client->rcSource);
--- 
-2.24.1
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
deleted file mode 100644
index cc6e4bdc9097..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-cmake-libdir.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3348a7e42e86dfb98dd7458ad29def476cf6096f Mon Sep 17 00:00:00 2001
-From: Christian Beier <dontmind@freeshell.org>
-Date: Sat, 9 Feb 2019 13:23:26 +0100
-Subject: [PATCH 02/51] CMake: replace hardcoded 'lib' with
- ${CMAKE_INSTALL_LIBDIR}
-
-Closes #281
----
- CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 873cc7b..55f7e65 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,7 @@ include(CheckTypeSize)
- include(TestBigEndian)
- include(CheckCSourceCompiles)
- include(CheckCSourceRuns)
-+include(GNUInstallDirs)
- 
- enable_testing()
- 
-@@ -666,8 +667,8 @@ get_link_libraries(PRIVATE_LIBS vncclient)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
- 
- 
--install_targets(/lib vncserver)
--install_targets(/lib vncclient)
-+install_targets(/${CMAKE_INSTALL_LIBDIR} vncserver)
-+install_targets(/${CMAKE_INSTALL_LIBDIR} vncclient)
- install_files(/include/rfb FILES
-     rfb/keysym.h
-     rfb/rfb.h
-@@ -677,7 +678,7 @@ install_files(/include/rfb FILES
-     rfb/rfbregion.h
- )
- 
--install_files(/lib/pkgconfig FILES
-+install_files(/${CMAKE_INSTALL_LIBDIR}/pkgconfig FILES
-     libvncserver.pc
-     libvncclient.pc
- )
--- 
-2.23.0
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-fix-shutdown-crash.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-fix-shutdown-crash.patch
deleted file mode 100644
index 0ae8d38c6f89..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-fix-shutdown-crash.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From d0a76539835d11c0f4723499f8be4bc9c7724eb9 Mon Sep 17 00:00:00 2001
-From: Rajesh Sahoo <rajesh.sahoo@lge.com>
-Date: Tue, 11 Jun 2019 15:13:04 +0530
-Subject: [PATCH] avoid pthread_join if backgroundLoop is FALSE
-
-client_thread is created depending upon backgroundLoop, but joining
-without checking for same condition. so we are trying to join a garbage
-thread_id.
----
- libvncserver/main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libvncserver/main.c b/libvncserver/main.c
-index d3cd9b1..772fb18 100644
---- a/libvncserver/main.c
-+++ b/libvncserver/main.c
-@@ -1112,6 +1112,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
-       }
- 
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-+    if(currentCl->screen->backgroundLoop) {
-       /*
- 	Notify the thread. This simply writes a NULL byte to the notify pipe in order to get past the select()
- 	in clientInput(), the loop in there will then break because the rfbCloseClient() above has set
-@@ -1120,6 +1121,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
-       write(currentCl->pipe_notify_client_thread[1], "\x00", 1);
-       /* And wait for it to finish. */
-       pthread_join(currentCl->client_thread, NULL);
-+    }
- #else
-       rfbClientConnectionGone(currentCl);
- #endif
--- 
-2.24.1
-
-From 15c4f144a3783d9f1f2c976acf9f4d85988fd466 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 5 Jan 2020 19:56:57 +0100
-Subject: [PATCH] rfbShutdownServer: Call rfbClientConnectionGone if no
- backgroundLoop
-
-Otherwise the servers that don't use rfbRunEventLoop don't get
-notified of client disconnections
----
- libvncserver/main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libvncserver/main.c b/libvncserver/main.c
-index b51f0ab..738a501 100644
---- a/libvncserver/main.c
-+++ b/libvncserver/main.c
-@@ -1152,6 +1152,8 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
-       write(currentCl->pipe_notify_client_thread[1], "\x00", 1);
-       /* And wait for it to finish. */
-       pthread_join(currentCl->client_thread, NULL);
-+    } else {
-+      rfbClientConnectionGone(currentCl);
-     }
- #else
-       rfbClientConnectionGone(currentCl);
--- 
-2.24.1
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-fix-tight-raw-decoding.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-fix-tight-raw-decoding.patch
deleted file mode 100644
index e862d634346f..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-fix-tight-raw-decoding.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6b87d6154200667a66212f80068f7468eaa0f048 Mon Sep 17 00:00:00 2001
-From: DRC <information@virtualgl.org>
-Date: Sat, 28 Sep 2019 14:54:30 -0500
-Subject: [PATCH 50/51] LibVNCClient: Fix regression in Tight/Raw decoding
-
-Introduced by d7b1462 in LibVNCServer 0.9.12.  This regression caused
-the pixels in some RFB rectangles to become corrupted/garbled when the
-Tight encoding was used, without the JPEG subencoding, with a 15-bit or
-16-bit color depth.
-
-Fixes #335
-Fixes https://gitlab.com/Remmina/Remmina/issues/1824
----
- libvncclient/tight.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libvncclient/tight.c b/libvncclient/tight.c
-index df01812..0586f47 100644
---- a/libvncclient/tight.c
-+++ b/libvncclient/tight.c
-@@ -1,5 +1,5 @@
- /*
-- *  Copyright (C) 2017 D. R. Commander.  All Rights Reserved.
-+ *  Copyright (C) 2017, 2019 D. R. Commander.  All Rights Reserved.
-  *  Copyright (C) 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
-  *  Copyright (C) 2004 Landmark Graphics Corporation.  All Rights Reserved.
-  *  Copyright (C) 2000, 2001 Const Kaplinsky.  All Rights Reserved.
-@@ -360,7 +360,8 @@ FilterCopyBPP (rfbClient* client, int srcx, int srcy, int numRows)
- #endif
- 
-   for (y = 0; y < numRows; y++)
--    memcpy (&dst[y*client->width], &client->buffer[y*client->rectWidth],
-+    memcpy (&dst[y*client->width],
-+            &client->buffer[y * client->rectWidth * (BPP / 8)],
-             client->rectWidth * (BPP / 8));
- }
- 
--- 
-2.23.0
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch
deleted file mode 100644
index a0313562ff1b..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 57be637006a95091119f7a49b4232e461116520f Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sat, 25 May 2019 02:02:47 +0300
-Subject: [PATCH] crypto: rfbcrypto_gnutls is actually libgcrypt-based
-
-Long time ago gnutls used libgcrypt as a cryptographic backend. Perhaps
-that was what caused the confusion.
----
- CMakeLists.txt                                       | 9 ++++-----
- common/{rfbcrypto_gnutls.c => rfbcrypto_libgcrypt.c} | 0
- 2 files changed, 4 insertions(+), 5 deletions(-)
- rename common/{rfbcrypto_gnutls.c => rfbcrypto_libgcrypt.c} (100%)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9ca4ba..0d3b4dc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -226,11 +226,10 @@ if(SYSTEMD_FOUND)
- endif(SYSTEMD_FOUND)
- 
- if(LIBVNCSERVER_HAVE_SYS_UIO_H)
--  if(GNUTLS_FOUND)
--    message(STATUS "Building crypto with GnuTLS")
--    set(CRYPTO_LIBRARIES ${GNUTLS_LIBRARIES})
--    set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_gnutls)
--    include_directories(${GNUTLS_INCLUDE_DIR})
-+  if(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES)
-+    message(STATUS "Building crypto with Libgcrypt")
-+    set(CRYPTO_LIBRARIES ${LIBGCRYPT_LIBRARIES})
-+    set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_libgcrypt)
-   elseif(OPENSSL_FOUND)
-     message(STATUS "Building crypto with OpenSSL")
-     set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES})
-diff --git a/common/rfbcrypto_gnutls.c b/common/rfbcrypto_libgcrypt.c
-similarity index 100%
-rename from common/rfbcrypto_gnutls.c
-rename to common/rfbcrypto_libgcrypt.c
--- 
-2.21.0
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-pkgconfig-libdir.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-pkgconfig-libdir.patch
deleted file mode 100644
index 6a50ac892064..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 36a71279ed5b10effecd879caf6c3791842ca713 Mon Sep 17 00:00:00 2001
-From: Christian Beier <dontmind@freeshell.org>
-Date: Thu, 28 Mar 2019 21:06:36 +0100
-Subject: [PATCH 03/51] CMake: replace 'lib' with ${CMAKE_INSTALL_LIBDIR} for
- pkgconfig files as well
-
-Thanks to https://github.com/ikelos for spotting this ;-)
-
-Closes #290
----
- libvncclient.pc.cmakein | 2 +-
- libvncserver.pc.cmakein | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein
-index 169a8b7..445f7e7 100644
---- a/libvncclient.pc.cmakein
-+++ b/libvncclient.pc.cmakein
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
- includedir=@CMAKE_INSTALL_PREFIX@/include
- 
- Name: LibVNCClient
-diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein
-index f38d74f..c689806 100644
---- a/libvncserver.pc.cmakein
-+++ b/libvncserver.pc.cmakein
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
- includedir=@CMAKE_INSTALL_PREFIX@/include
- 
- Name: LibVNCServer
--- 
-2.23.0
-
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-sparc-unaligned.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-sparc-unaligned.patch
deleted file mode 100644
index dce787f1295a..000000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.12-sparc-unaligned.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0cf1400c61850065de590d403f6d49e32882fd76 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike@sf-mail.de>
-Date: Tue, 28 May 2019 18:30:46 +0200
-Subject: [PATCH] fix crash because of unaligned accesses in
- hybiReadAndDecode()
-
----
- libvncserver/ws_decode.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/libvncserver/ws_decode.c b/libvncserver/ws_decode.c
-index 441ebc7..10c44d1 100644
---- a/libvncserver/ws_decode.c
-+++ b/libvncserver/ws_decode.c
-@@ -327,7 +327,6 @@ hybiReadAndDecode(ws_ctx_t *wsctx, char *dst, int len, int *sockRet, int nInBuf)
-   int bufsize;
-   int nextRead;
-   unsigned char *data;
--  uint32_t *data32;
- 
-   /* if data was carried over, copy to start of buffer */
-   memcpy(wsctx->writePos, wsctx->carryBuf, wsctx->carrylen);
-@@ -383,10 +382,12 @@ hybiReadAndDecode(ws_ctx_t *wsctx, char *dst, int len, int *sockRet, int nInBuf)
-   /* for a possible base64 decoding, we decode multiples of 4 bytes until
-    * the whole frame is received and carry over any remaining bytes in the carry buf*/
-   data = (unsigned char *)(wsctx->writePos - toDecode);
--  data32= (uint32_t *)data;
- 
-   for (i = 0; i < (toDecode >> 2); i++) {
--    data32[i] ^= wsctx->header.mask.u;
-+    uint32_t tmp;
-+    memcpy(&tmp, data + i * sizeof(tmp), sizeof(tmp));
-+    tmp ^= wsctx->header.mask.u;
-+    memcpy(data + i * sizeof(tmp), &tmp, sizeof(tmp));
-   }
-   ws_dbg("mask decoding; i=%d toDecode=%d\n", i, toDecode);
- 
--- 
-2.16.4
-
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
deleted file mode 100644
index 9ea5a4c3370d..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P="LibVNCServer-${PV}"
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# libvncserver/tightvnc-filetransfer/*: GPL-2, but we don't build it
-# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88
-LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
-# no sub slot wanted (yet), see #578958
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
-# https://bugs.gentoo.org/690202
-# https://bugs.gentoo.org/435326
-# https://bugs.gentoo.org/550916
-REQUIRED_USE="jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )"
-
-DEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
-	ssl? (
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.2:0= )
-			libressl? ( >=dev-libs/libressl-2.7.0:0= )
-		)
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
-	)
-	jpeg? ( >=virtual/jpeg-0-r2:0 )
-	lzo? ( dev-libs/lzo )
-	png? ( >=media-libs/libpng-1.6.10:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-libdir.patch
-	"${FILESDIR}"/${P}-pkgconfig-libdir.patch
-	"${FILESDIR}"/${P}-libgcrypt.patch
-	"${FILESDIR}"/${P}-sparc-unaligned.patch
-	"${FILESDIR}"/${P}-CVE-2018-20750.patch
-	"${FILESDIR}"/${P}-CVE-2019-15681.patch
-	"${FILESDIR}"/${P}-fix-tight-raw-decoding.patch
-	"${FILESDIR}"/${P}-fix-shutdown-crash.patch
-	"${FILESDIR}"/${P}-CVE-2019-15690.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_ZLIB=$(usex zlib ON OFF)
-		-DWITH_LZO=$(usex lzo ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_PNG=$(usex png ON OFF)
-		-DWITH_THREADS=$(usex threads ON OFF)
-		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
-		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
-		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-		-DWITH_FFMPEG=OFF
-		-DWITH_24BPP=$(usex 24bpp ON OFF)
-		-DWITH_IPv6=$(usex ipv6 ON OFF)
-		-DWITH_SASL=$(usex sasl ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
index 679f07283945..c513bda1f85d 100644
--- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
index 4c354dd63641..ac292fe29293 100644
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ b/net-libs/signond/signond-8.60-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VER
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index f4c30bf79695..9de15869195e 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index 91fecbe31332..47491b009b6a 100644
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="selinux"
 
 DEPEND="virtual/os-headers"
diff --git a/net-misc/curl/curl-7.71.0.ebuild b/net-misc/curl/curl-7.71.0.ebuild
index cfcba68debda..a4b20118122e 100644
--- a/net-misc/curl/curl-7.71.0.ebuild
+++ b/net-misc/curl/curl-7.71.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
index 81bf94e65eb9..91c6282c51a8 100644
--- a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
+++ b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tsr"
 
 BDEPEND="tsr? ( app-arch/unzip )"
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 47976ef867f4..1eb4cd0d0577 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,2 +1,2 @@
-DIST kea-1.7.7.tar.gz 7391670 BLAKE2B 0a0cc58d74de5b0729c4e684d79e271d122ec689c623f72ae1f8b6f631bea99ec7416721f406a5dc54ec0132c090f8a7583818d0ec4e1a9507fc5c1bc13014b6 SHA512 af65a7aff9c06fe078df5ed72737b0bc537dc1cc790f0e32449b73642ee7b4b582cc30cfe37283eed66fe2617eae22d5b48c3991d0e53d83b99327ccc17f63c1
 DIST kea-1.7.8.tar.gz 7443616 BLAKE2B 88de7f0ffb0cf9b594eabf6520c6d1b16d1e94524ae12087e9cd119aa1d6396f250c2f6d77fdc8d87cf46f892f26054625be083d4e4e5bfecc498092e9146c2f SHA512 1bed7a20f0ee2198eb6c196cf6895217fecea1a8274d155d669bf30ac1aab795917e7537d279bad55c951c3c99a7cd7cf9a86594bf6f7a689d1f694823353a28
+DIST kea-1.7.9.tar.gz 7481156 BLAKE2B eef2561b79ad83c18d42a0d23e97fc27205190475c24bb871112050b5ec0a134c4c448c03c4f1b678aadf7d54c7f96481c43485187408f8bfebe6f2c6edbc832 SHA512 180e80dbf21789e9c18c69b9e03a2ad4519eb3386cf8c4221a283883eb8151443e888b6a95d1affb0790ef25d6174582448bf590eb2ddadb12b965cba7dc8717
diff --git a/net-misc/kea/kea-1.7.7.ebuild b/net-misc/kea/kea-1.7.9.ebuild
similarity index 100%
rename from net-misc/kea/kea-1.7.7.ebuild
rename to net-misc/kea/kea-1.7.9.ebuild
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index cd247855aa07..1ec6bca9afed 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,3 +1,3 @@
 DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
 DIST rsync-3.2.1.tar.gz 1051665 BLAKE2B de1ee047b9a378cd16fceb188d0a2e14e78751c8295263e183888b464ced9263be600bbb04b7793d48e7aa1fd2ab0709d717234f346cc6a5a028c3daddcb019e SHA512 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c
-DIST rsync-3.2.2pre1.tar.gz 1055617 BLAKE2B 4035c77f9e86a84bfd173903f5f6d4a954344b4eb1d1b267c1a86a5a74bd61d190f9fbcffa0b838278b89b29ebce47244eafc05d012753ae1b3a5d77682de3f2 SHA512 a8f1ddc62307615f9173cbe45ee4b2f6eab93833441ab76582b0226f44b58bb18f2e2cb0ce03092c8b4c153b4ae616ccf2c15411003360857611383b05aca25e
+DIST rsync-3.2.2pre2.tar.gz 1056347 BLAKE2B 648a5cd120cf6468e4009d766a92e91da51d142ff814abdd7db362c7170d36cd0bd7a1ff6672eed79ec2d37b2ec18a40bb18b0fee6f8610cff57f3bb5d029e60 SHA512 7427d6929b0b7eff8632db20049cb74fbb31c295e059b86dc92e3fce5c1d260ec1e9c2ec9615d985d55f0d6b22c89410fd61148b26a3eda56b6518efb8ad6518
diff --git a/net-misc/rsync/rsync-3.2.2_pre1.ebuild b/net-misc/rsync/rsync-3.2.2_pre2.ebuild
similarity index 100%
rename from net-misc/rsync/rsync-3.2.2_pre1.ebuild
rename to net-misc/rsync/rsync-3.2.2_pre2.ebuild
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 60d0f275de68..e08cc46fdcf7 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index ea087fb9106e..6686a51026c0 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,5 +1,2 @@
-DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 BLAKE2B d5acb0edf6389a7dd1382aad290b1541f147c11d06e1e8458aa1c6a7a3dd9e5d1db0a1a0f6f63d489c0bc464d545c6a1b6cf752f8a0050f9efb6f6d576e6e32f SHA512 58d3053aa140cbec214033ea3c524e7e7b670aa94a6ff306b9d816ffd4c23b8c781b1178ef7ce14009f8b45afaf05f75e9248e8c1eebef790b838baef5f50c26
 DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 BLAKE2B 4272bab8d85ef0f39c8b26fd035009d3c77dd629fd7853e0072232393d329af1885ce44c4877d7718a37154661d9c85bb1f5276463875f9dfbbd023106d9d15a SHA512 b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
-DIST nsscache-0.30.tar.gz 109615 BLAKE2B 1b67da7241a974a541514849643115d8e6dd0e587dbd39e1919eaca5064b6fde79678c3443246444d1b8c75c4455ad008231ee1f1a6b74511d9a38e742be2c6e SHA512 22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
-DIST nsscache-0.31.tar.gz 108073 BLAKE2B c730786e4a273d039273f104d1458587741c5bc8b2e470d12a551765f3141aafb33df811feca432b493415e20c9abb07244b9c624e38053b95c15c5e41ba8303 SHA512 1be90b0217605f86d2effc6063a805fb604f535386cc9f2eb8b0244ab1293521fd1342f52e3fad98c7d95cf66db3dabf93747bf40ce5ed2bf70c8c07382001a4
-DIST nsscache-0.32.tar.gz 112333 BLAKE2B ac477eef53e8e9d8cdcc7a0d7b460046883aaba8836ec5d49f449aae0d4f0ea34cd10f89a98849a18e0a0b1b5d1eb4f4c99a138d6eb2bc6bc608a1cc33c28ac2 SHA512 c35f539ea017a328c1630031b7934c231b256d3f2198c6764954c42f36ed281432ff97667e5754692971b4f24be38887406f98718d5f49d364e1e3eebb32185f
+DIST nsscache-0.39.tar.gz 127896 BLAKE2B 8383ca53ee5cf2f84e4485722d35598b624005bb32073696a23daa1061c0b057d26333cdee9c97cedcb99daa8c61362719d80b01b216c163a327cd4edeabeefd SHA512 f93cec949302f21bc5989ab3192302a32349ee4ae98e2f05f169cca8a16a821f39857cb0fff52c7b54552828684b4723d22e44f97525a01577ab89bd159e0376
diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml
index 2391c0ec85c5..49a9b9a18f2b 100644
--- a/net-nds/nsscache/metadata.xml
+++ b/net-nds/nsscache/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<use>
 		<flag name="nsscache">Depend on sys-auth/libnss-cache to handle flat files</flag>
+		<flag name="s3">Support for S3-based NSS sources</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">google/nsscache</remote-id>
diff --git a/net-nds/nsscache/nsscache-0.30-r2.ebuild b/net-nds/nsscache/nsscache-0.30-r2.ebuild
deleted file mode 100644
index 522bf5454392..000000000000
--- a/net-nds/nsscache/nsscache-0.30-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache"
-SRC_URI="
-	https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~robbat2/nsscache-0.30-gentoo-authorized-keys-command.py"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nsscache"
-
-DEPEND="${PYTHON_DEPS}
-		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/bsddb3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-RESTRICT="test"
-S="${WORKDIR}/${PN}-version-${PV}"
-
-src_prepare() {
-	find "${S}" -name '*.py' -exec \
-		sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
-		{} \+
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman nsscache.1 nsscache.conf.5
-	dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-	exeinto /usr/libexec/nsscache
-	newexe "${DISTDIR}"/nsscache-0.30-gentoo-authorized-keys-command.py authorized-keys-command.py
-
-	keepdir /var/lib/nsscache
-}
diff --git a/net-nds/nsscache/nsscache-0.30.ebuild b/net-nds/nsscache/nsscache-0.30.ebuild
deleted file mode 100644
index 822766f671c9..000000000000
--- a/net-nds/nsscache/nsscache-0.30.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache"
-SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nsscache"
-
-DEPEND="${PYTHON_DEPS}
-		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-RESTRICT="test"
-S="${WORKDIR}/${PN}-version-${PV}"
-
-src_prepare() {
-	find "${S}" -name '*.py' -exec \
-		sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
-		{} \+
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman nsscache.1 nsscache.conf.5
-	dodoc THANKS nsscache.cron
-
-	keepdir /var/lib/nsscache
-}
diff --git a/net-nds/nsscache/nsscache-0.31.ebuild b/net-nds/nsscache/nsscache-0.31.ebuild
deleted file mode 100644
index a62723e48c66..000000000000
--- a/net-nds/nsscache/nsscache-0.31.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache"
-SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
-SRC_URI="
-	https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~robbat2/${SCRIPT_A}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nsscache"
-
-DEPEND="${PYTHON_DEPS}
-		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/bsddb3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-RESTRICT="test"
-S="${WORKDIR}/${PN}-version-${PV}"
-
-src_prepare() {
-	find "${S}" -name '*.py' -exec \
-		sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
-		{} \+
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman nsscache.1 nsscache.conf.5
-	dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-	exeinto /usr/libexec/nsscache
-	newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
-
-	keepdir /var/lib/nsscache
-}
diff --git a/net-nds/nsscache/nsscache-0.32.ebuild b/net-nds/nsscache/nsscache-0.32.ebuild
deleted file mode 100644
index a62723e48c66..000000000000
--- a/net-nds/nsscache/nsscache-0.32.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache"
-SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
-SRC_URI="
-	https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~robbat2/${SCRIPT_A}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nsscache"
-
-DEPEND="${PYTHON_DEPS}
-		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/bsddb3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-RESTRICT="test"
-S="${WORKDIR}/${PN}-version-${PV}"
-
-src_prepare() {
-	find "${S}" -name '*.py' -exec \
-		sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
-		{} \+
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman nsscache.1 nsscache.conf.5
-	dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-	exeinto /usr/libexec/nsscache
-	newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
-
-	keepdir /var/lib/nsscache
-}
diff --git a/net-nds/nsscache/nsscache-0.39.ebuild b/net-nds/nsscache/nsscache-0.39.ebuild
new file mode 100644
index 000000000000..f50a61c5cd89
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.39.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache"
+SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
+SRC_URI="
+	https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~robbat2/${SCRIPT_A}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nsscache s3"
+RESTRICT="test" # requires network
+
+DEPEND="
+	dev-python/ldap3[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+
+S="${WORKDIR}/${PN}-version-${PV}"
+
+python_prepare_all() {
+	sed -i \
+		-e "/setup_requires/s,'pytest-runner',,g" \
+		-e '/tests_require/s,\[.*\],[],g' \
+		setup.py || die
+	sed -i \
+		-e '/test=pytest/d' \
+		setup.cfg || die
+	sed -i \
+		-e '/pytest/d' \
+		requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile --verbose
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_scriptinto /usr/libexec/nsscache
+	python_newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman nsscache.1 nsscache.conf.5
+	dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
+
+	keepdir /var/lib/nsscache
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 9e41a2fc2500..0650f15eac19 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/tremc/Manifest b/net-p2p/tremc/Manifest
index 5304ec87b788..7e7b6b1bb16f 100644
--- a/net-p2p/tremc/Manifest
+++ b/net-p2p/tremc/Manifest
@@ -1 +1 @@
-DIST tremc-0.9.1.tar.gz 315482 BLAKE2B c4e94ef13cc9d716cdbcbff061b1956d17c6babe765e192d675d08ad5d76a22cf171a4fb3f5f2952b971f59a16a2768ccd360d10df5b0f3325fd63ff9716f209 SHA512 ed16080c6544ce9019e6a0c4d660310992cae0f139a2a78e9eaa51841e293cefb22160a105794b5f03a4bfd47a2c50402879f2a17302a96265a9c9acb3174c39
+DIST tremc-0.9.2.tar.gz 315631 BLAKE2B f5ed154fbfcbdb3e77b678a5827d3f68a6be4033530d6d4e451d57808d43cd5737fff32cf62445d246bfce4d8f02e4cac0c1156603e220e228e61b725d6deaf8 SHA512 d6d6d155ddac918d329226d5c3b53c63fd4fa0b98e30f1eb2cd2226ea598bd7dd81d72f747dc11f4a508bcc0453d90d774c1d8db6dac05ae1ecbc217290b7db3
diff --git a/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch b/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch
deleted file mode 100644
index 5e67e5d31555..000000000000
--- a/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0cb919b446eeda41aea8578ae26796ae92a973e5 Mon Sep 17 00:00:00 2001
-From: George Angelopoulos <george@usermod.net>
-Date: Mon, 2 Jul 2018 17:55:38 +0200
-Subject: [PATCH] fix addch ERR crash when starting with no torrents
-
-There was a bug introduced by commit e06d08d:
-    scale_bytes: Simplify this function
-
-tremc would crash when started against a transmission-daemon with no
-torrents.
-
-This was because scale_bytes(0) used to return 0K but now it returns
-0.0K. The expected width of 2 was hardcoded. The new width of 4 causes
-addch() to return ERR because it tries to draw outside the window.
-
-Hardcoding the new width to 4 would resolve this issue. Instead,
-this patch dynamically sets the width returned by scale_bytes().
-This should make the code a tiny bit more readable and maybe avoid this
-issue in the future.
-
-There is one more magic number involved here which I don't see a good
-way of getting rid of. So I made an illustrative comment.
-
-Resolves #15
----
- tremc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tremc b/tremc
-index 36ae67b..ed898fb 100755
---- a/tremc
-+++ b/tremc
-@@ -883,7 +883,7 @@ class Interface(object):
-         self.focus        = -1  # -1: nothing focused; 0: top of list; <# of torrents>-1: bottom of list
-         self.scrollpos    = 0   # start of torrentlist
-         self.torrents_per_page  = 0 # will be set by manage_layout()
--        self.rateDownload_width = self.rateUpload_width = 2
-+        self.rateDownload_width = self.rateUpload_width = len(scale_bytes())
- 
-         self.details_category_focus = 0  # overview/files/peers/tracker in details
-         self.focus_detaillist       = -1 # same as focus but for details
-@@ -2667,6 +2667,8 @@ class Interface(object):
-                     pass
- 
-     def draw_global_rates(self):
-+        # ↑1.2K ↓3.4M
-+        # ^    ^^     => +3
-         rates_width = self.rateDownload_width + self.rateUpload_width + 3
- 
-         if self.stats['alt-speed-enabled']:
-@@ -3373,7 +3375,7 @@ def timestamp(timestamp, format="%x %X"):
-     return "%s (%s)" % (absolute, relative)
- 
- 
--def scale_bytes(bytes, type='short'):
-+def scale_bytes(bytes=0, type='short'):
-     if bytes >= 1099511627776:
-         scaled_bytes = round((bytes / 1099511627776.0), 1)
-         unit = 'T'
--- 
-2.26.0
-
diff --git a/net-p2p/tremc/tremc-0.9.1.ebuild b/net-p2p/tremc/tremc-0.9.2.ebuild
similarity index 68%
rename from net-p2p/tremc/tremc-0.9.1.ebuild
rename to net-p2p/tremc/tremc-0.9.2.ebuild
index 8306b1e2dfac..2c02ce97e8da 100644
--- a/net-p2p/tremc/tremc-0.9.1.ebuild
+++ b/net-p2p/tremc/tremc-0.9.2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="ncurses"
-inherit bash-completion-r1 python-single-r1
+inherit bash-completion-r1 eutils python-single-r1
 
 DESCRIPTION="Ncurses interface for the Transmission BitTorrent client"
 HOMEPAGE="https://github.com/tremc/tremc"
@@ -14,17 +14,9 @@ SRC_URI="https://github.com/tremc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="geoip"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	')
-"
-
-# This fixes a crash when starting that was committed after 0.9.1
-PATCHES=( "${FILESDIR}/${PV}-fix-startup-crash.patch" )
+RDEPEND="${PYTHON_DEPS}"
 
 # Specify a no-op src_compile so upstream's broken Makefile doesn't get used
 src_compile() {
@@ -39,3 +31,9 @@ src_install() {
 	doman tremc.1
 	dodoc NEWS README.md
 }
+
+pkg_postinst() {
+	optfeature "GeoIP support" dev-python/geoip-python
+	optfeature "Extract ipv4 from ipv6 addresses" dev-python/ipy
+	optfeature "Clipboard support" dev-python/pyperclip
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 1be00838b41c..fd36541313e9 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index aa209a896678..dac695fdb6a1 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,2 +1 @@
-DIST squid-4.11.tar.xz 2447700 BLAKE2B 9080508caff683bffe3e2eb64a454c95f69ab47c0ca9b1a649e553daf0dde2391aa14c6631aa6ee617687b122beef691cbe9a8e49ac5e5ea8a9737847ece9444 SHA512 02d4bb4d5860124347670615e69b1b92be7ea4fc0131e54091a06cb2e67bd73583d8e6cbe472473f0c59764611a49561d02ab9fe2bf0305ce4652d4ec7714f26
 DIST squid-4.12.tar.xz 2450564 BLAKE2B 39068d5e999ebf62fbc45ea8faa8811c7b4e6a231f814f2580f54ce3ac499b503b7bc071188b4446a2a94f7eb2f4cfc6369a1b578e637a7b5e37a0ae2aabfb8e SHA512 96fa700a0c28711eb1ec5e44e1d324dc8d3accdddbc675def8babe057e2cc71083bd3817bc37cbd9f3c03772743df578573ee3698bbd6131df68c3580ad31ef4
diff --git a/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch b/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch
deleted file mode 100644
index cf4d3ebb9a56..000000000000
--- a/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0cbf89e7d266aabacc8651759a8509ebbe0f5c93 Mon Sep 17 00:00:00 2001
-From: Alex Rousskov <rousskov@measurement-factory.com>
-Date: Mon, 20 Apr 2020 15:32:48 -0400
-Subject: [PATCH] Bug 5041: Missing Debug::Extra breaks build on hosts with
- systemd
-
-Master commit 6fa8c66 (i.e. Bug 5016 fix) relied on Debug::Extra added
-by master commit (ccfbe8f) that was not ported to v4. The port of the
-former master commit lacked the required piece of the latter commit.
-
-The problem is invisible on hosts without a systemd package (that Squid
-can find/use) and with Squids explicitly ./configured --without-systemd.
----
- src/Debug.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/Debug.h b/src/Debug.h
-index 6eecd01bf9..ddd9e38f8f 100644
---- a/src/Debug.h
-+++ b/src/Debug.h
-@@ -99,6 +99,10 @@ class Debug
- 
-     /// configures the active debugging context to write syslog ALERT
-     static void ForceAlert();
-+
-+    /// prefixes each grouped debugs() line after the first one in the group
-+    static std::ostream& Extra(std::ostream &os) { return os << "\n    "; }
-+
- private:
-     static Context *Current; ///< deepest active context; nil outside debugs()
- };
diff --git a/net-proxy/squid/squid-4.11.ebuild b/net-proxy/squid/squid-4.11.ebuild
deleted file mode 100644
index d46ef90915e9..000000000000
--- a/net-proxy/squid/squid-4.11.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic linux-info pam toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-r=
-#r=-20181117-r0022167
-if [ -z "$r" ]; then
-	SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}.tar.xz"
-else
-	SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}${r}.tar.bz2"
-	S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap esi ssl-crtd \
-	mysql postgres sqlite \
-	perl qos tproxy \
-	+htcp +wccp +wccpv2 \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/perl"
-
-COMMON_DEPEND="acct-group/squid
-	acct-user/squid
-	caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( sys-libs/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? (
-		!gnutls? ( dev-libs/openssl:0 )
-		dev-libs/nettle:= )
-	sasl? ( dev-libs/cyrus-sasl )
-	ecap? ( net-libs/libecap:1 )
-	esi? ( dev-libs/expat dev-libs/libxml2 )
-	gnutls? ( >=net-libs/gnutls-3.1.5 )
-	logrotate? ( app-admin/logrotate )
-	>=sys-libs/db-4:*
-	dev-libs/libltdl:0"
-
-DEPEND="${COMMON_DEPEND}
-	${BDEPEND}
-	ecap? ( virtual/pkgconfig )
-	test? ( dev-util/cppunit )"
-
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	perl? ( dev-lang/perl )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	selinux? ( sec-policy/selinux-squid )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-REQUIRED_USE="tproxy? ( caps )
-		qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
-	eapply "${FILESDIR}/${PN}-4.11-missing-debug-extra.patch"
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/purge.1  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		src/acl/external/unix_group/ext_unix_group_acl.8 \
-		src/acl/external/session/ext_session_acl.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am || die
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",SMB_LM,LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	local myconf="--without-mit-krb5 --without-heimdal-krb5"
-	if use kerberos ; then
-		negotiate_modules="kerberos,wrapper"
-		if has_version app-crypt/heimdal ; then
-			myconf="--without-mit-krb5 --with-heimdal-krb5"
-		else
-			myconf="--with-mit-krb5 --without-heimdal-krb5"
-		fi
-	fi
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="SMB_LM"
-
-	local ext_helpers="file_userip,session,unix_group,delayer,time_quota"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-	if use mysql || use postgres || use sqlite ; then
-	    ext_helpers+=",SQL_session"
-	fi
-
-	local storeio_modules="aufs,diskd,rock,ufs"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	tc-export_build_env BUILD_CXX
-	export BUILDCXX=${BUILD_CXX}
-	export BUILDCXXFLAGS=${BUILD_CXXFLAGS}
-	tc-export CC AR
-
-	# Should be able to drop this workaround with newer versions.
-	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
-	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
-
-	# Bug #719662
-	(use ppc || use arm || use hppa) && append-libs -latomic
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--with-large-files \
-		--with-build-environment=default \
-		--disable-strict-error-checking \
-		--disable-arch-native \
-		--with-included-ltdl=/usr/include \
-		--with-ltdl-libdir=/usr/$(get_libdir) \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_with ssl openssl) \
-		$(use_with ssl nettle) \
-		$(use_with gnutls) \
-		$(use_enable ssl-crtd) \
-		$(use_enable ecap) \
-		$(use_enable esi) \
-		$(use_enable htcp) \
-		$(use_enable wccp) \
-		$(use_enable wccpv2) \
-		${transparent} \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# these scripts depend on perl
-	if ! use perl; then
-		for f in basic_pop3_auth \
-			ext_delayer_acl \
-			helper-mux \
-			log_db_daemon \
-			security_fake_certverify \
-			storeid_file_rewrite \
-			url_lfs_rewrite; do
-				rm "${D}"/usr/libexec/squid/${f} || die
-		done
-	fi
-
-	# cleanup
-	rm -r "${D}"/run "${D}"/var/cache || die
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc src/auth/negotiate/kerberos/README README.kerberos
-	newdoc src/auth/basic/RADIUS/README README.RADIUS
-	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
-	dodoc RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r2" squid
-	newinitd "${FILESDIR}/squid.initd-r5" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
-	if [ ${#r} -gt 0 ]; then
-		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
-	fi
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 877fbc6cdaeb..92cba9280b58 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
index 936a26c2ca5c..98147f688619 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index fe4344acb3fd..620715a43155 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index 96302cff734c..9bf1f42c14b7 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust, which is available here
+# Bug #677018
+-net-news/newsboat
+
 # James Le Cuirot <chewi@gentoo.org> (2016-01-09)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 0f744267ab9b..983866095825 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust, which is available here
+# Bug #677018
+-net-news/newsboat
+
 # Sam James <sam@cmpct.info> (2020-06-24)
 # Valgrind works on ARMv7
 -dev-util/valgrind
diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask
new file mode 100644
index 000000000000..8aea7c2c8832
--- /dev/null
+++ b/profiles/arch/arm/armv7a/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@cmpct.info> (2020-06-27)
+# Tests require Valgrind, available on armv7a
+dev-libs/rapidjson -test
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 55b8688549df..34754836d7f6 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust (only on >= armv6j)
+# Bug #677018
+net-news/newsboat
+
 # Sam James <sam@cmpct.info> (2020-06-24)
 # Valgrind lacks support for < ARMv7
 # https://valgrind.org/info/platforms.html
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index db3826895aaa..442c1611b3de 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -14,8 +14,3 @@ dev-lang/rust llvm_targets_ARM
 dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
-
-# Anthony G. Basile <blueness@gentoo.org> (2012-11-11)
-# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm
-# gets stable keyword, this line can be removed.
-x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 66421dc468c5..5bc88d8bd6ba 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-27)
+# Tests require Valgrind, not available on <armv7a
+dev-libs/rapidjson test
+
 # Michał Górny <mgorny@gentoo.org> (2020-06-19)
 # Requires dev-util/dwarves.
 sys-kernel/gentoo-kernel debug
@@ -36,10 +40,6 @@ mate-base/mate bluetooth
 # Mask until gui-libs/gtk-layer-shell is keyworded
 mate-base/mate-panel wayland
 
-# Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
-# Mask until dev-libs/libfido2 is keyworded
-net-misc/openssh security-key
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
 # media-libs/libheif is not keyworded
 media-gfx/gimp heif
@@ -65,10 +65,6 @@ sci-libs/pcl vtk
 # Neither sys-apps/bolt nor kde-plasma/plasma-thunderbolt are keyworded
 kde-plasma/plasma-meta thunderbolt
 
-# Michał Górny <mgorny@gentoo.org> (2019-07-13)
-# app-forensics/libewf is not keyworded here.
-app-admin/testdisk ewf
-
 # Craig Andrews <candrews@gentoo.org> (2019-07-03)
 # Unmask Raspberry Pi support on arm.
 media-tv/kodi -raspberry-pi
@@ -78,11 +74,6 @@ media-tv/kodi -raspberry-pi
 # build on arm.
 >=dev-lang/spidermonkey-60 -jit
 
-# Lars Wendler <polynomial-c@gentoo.org> (2019-04-29)
-# Requires app-text/discount and net-libs/webkit-gtk which both have
-# no keywords on arm
-dev-util/geany-plugins markdown
-
 # Patrick McLean <chutzpah@gentoo.org> (2019-04-15)
 # deps not available on platform
 sys-cluster/ceph babeltrace lttng
@@ -106,19 +97,11 @@ net-im/ejabberd hipe
 # (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed
 sys-apps/fwupd dell thunderbolt
 
-# Bernard Cafarelli <voyageur@gentoo.org> (2019-01-14)
-# Requires dev-php/pecl-imagick which is not keyworded on arm
-www-apps/nextcloud imagemagick
-
 # Davide Pesavento <pesa@gentoo.org> (2018-12-27)
 # The corresponding Qt5 modules are not keyworded on arm, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
 dev-python/PyQt5 networkauth
 
-# Aaron W. Swenson <titanofold@gentoo.org> (2018-10-19)
-# Requires sys-devel/clang which isn’t keyworded for ARM.
-dev-db/postgresql llvm
-
 # Michał Górny <mgorny@gentoo.org> (2018-10-18)
 # Requires unported sys-libs/netbsd-csu.
 sys-devel/clang-runtime crt
@@ -132,22 +115,6 @@ dev-ruby/capybara test
 # pre-built, no ARM support
 net-wireless/gr-osmosdr sdrplay
 
-# Tomáš Mózes <hydrapolic@gmail.com> (2018-08-10)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-app-admin/syslog-ng geoip2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2018-07-04)
-# dev-libs/xxhash not keyworded for arm
-app-admin/rsyslog xxhash
-
-# Tomáš Mózes <hydrapolic@gmail.com> (2018-06-19)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2018-06-06)
-# Needs sys-apps/fakechroot which isn't keyworded
-app-arch/rpm test
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-06-03)
 # net-wireless/soapysdr not keyworded
 net-wireless/gr-osmosdr soapy
@@ -165,10 +132,6 @@ net-libs/gnutls test-full
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 notebook qt5 smp
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-02-04)
-# Depends on not yet keyworded dev-python/geoip-python. Bug #636860
-net-p2p/deluge geoip
-
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # Moved from use.mask since they are flags local to one package.
 media-tv/tvheadend hdhomerun
@@ -255,19 +218,10 @@ dev-db/mariadb -jdbc
 sci-mathematics/octave graphicsmagick
 media-gfx/zbar graphicsmagick
 
-# Göktürk Yüksek <gokturk@gentoo.org> (2016-06-14) on behalf of
-# Nicholas Vinson <nvinso234@gmail.com> (proxy-maint)
-# net-firewall/nftables[doc] requires dblatex which is not keyworded
-net-firewall/nftables doc
-
 # Amy Winston <amynka@gentoo.org> (2016-06-12)
 # does not build on arm at all (upstream bug)
 dev-scheme/racket futures jit
 
-# Patrick McLean <chutzpah@gentoo.org> (2016-05-12)
-# Tests require dev-python/tox which isn't keyworded on arm
-sys-cluster/ceph test
-
 # Thomas Deutschmann <whissi@gentoo.org> (2016-03-19)
 # Unkeyworded deps, bug #564274
 app-metrics/collectd collectd_plugins_gmond
@@ -317,10 +271,6 @@ media-video/ffmpeg -mmal
 # unkeyworded deps, bug #552330
 app-portage/g-sorcery bson
 
-# Markos Chandras <hwoarang@gentoo.org> (2015-04-18)
-# samba-4 not keyworded on arm
-sys-auth/sssd samba
-
 # Alexis Ballier <aballier@gentoo.org> (2015-04-02)
 # Needs ilmbase (openexr), which does not build and is masked on arm.
 media-libs/freeimage tiff
@@ -406,10 +356,6 @@ app-emulation/xen-tools system-qemu doc
 # Needs sci-physics/bullet tested #499974
 dev-libs/efl physics
 
-# Jason A. Donenfeld <zx2c4@gentoo.org> (2014-01-27)
-# luajit isn't keyworded for arm yet, which is a bummer
-net-im/prosody jit
-
 # Markus Meier <maekke@gentoo.org> (2013-12-26)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
@@ -422,10 +368,6 @@ net-im/telepathy-connection-managers sipe
 # Missing keywords, bug #478254
 gnome-base/gnome classic extras
 
-# Benda Xu <heroxbd@gentoo.org> (2013-10-31)
-# Missing keywords from dev-ml/lablgtk, bug #487722
-net-p2p/mldonkey gtk guionly
-
 # Markus Meier <maekke@gentoo.org> (2013-09-15)
 # Unkeyworded deps, bug #481462
 dev-python/ipython nbconvert
@@ -446,11 +388,6 @@ app-admin/conky cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
 # Not tested
 media-libs/devil allegro nvtt
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-07-13)
-# requires net-misc/freerdp which is not keyworded on arm
-# screen-sharing requires rdp flag
-dev-libs/weston rdp screen-sharing
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (2013-05-27)
 # Firmware loader not keyworded yet
 sci-libs/linux-gpib firmware
@@ -460,7 +397,9 @@ sci-libs/linux-gpib firmware
 media-gfx/povray mkl
 
 # Benda Xu <heroxbd@gentoo.org> (2013-04-01)
-# dev-ml/lablgtk not keyworded
+# Sam James <sam@cmpct.info> (2020-06-29)
+# net-misc/x11-ssh-askpass nor
+# net-misc/ssh-askpass-fullscreen keyworded
 net-misc/unison gtk
 
 # Julian Ospald <hasufell@gentoo.org> (2013-03-31)
@@ -510,14 +449,6 @@ app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_ex
 # No java on ARM
 net-analyzer/wireshark bcg729 maxminddb
 
-# Markus Meier <maekke@gentoo.org> (2012-07-25)
-# no stable media-video/vlc yet, bug #401313
-media-libs/phonon vlc
-
-# Michael Sterrett <mr_bones_@gentoo.org> (2012-03-04)
-# arm is missing keywords for >=dev-libs/json-glib-0.12
-app-admin/syslog-ng json
-
 # Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for arm
@@ -530,25 +461,13 @@ dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
 dev-qt/qtwebkit -jit
 
-# Sebastian Pipping <sping@gentoo.org> (2011-02-22)
-# No media-sound/lilypond here, yet (bug #356069)
-app-text/asciidoc test
-
-# Jim Ramsay <lack@gentoo.org> (2008-11-05)
-# app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
-app-admin/gkrellm ntlm
-
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug taglib vcd wavpack dvd
 
-# Ultrabug <ultrabug@gentoo.org> (2011-09-05)
-# missing keyword for net-libs/zeromq
-app-admin/rsyslog zeromq
-
 # Ian Whyman <thev00d00@gentoo.org> (2016-05-22)
 # RPI support on arm
 dev-libs/libcec -raspberry-pi
 
 # Ian Whyman <thev00d00@gentoo.org> (2017-09-05)
-# missing keywords dev-lang/duktape media-libs/lastfmlib
-net-misc/gerbera javascript lastfm
+# missing keywords media-libs/lastfmlib
+net-misc/gerbera lastfm
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 89059484015f..d197a96abbbb 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-28)
+# Deps not yet stable
+# Migrated from package.use.mask
+app-text/asciidoc test
+media-libs/phonon vlc
+net-misc/openssh security-key
+dev-util/geany-plugins markdown
+app-arch/rpm test
+net-misc/openssh security-key
+dev-util/geany-plugins markdown
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-11-02)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
@@ -35,10 +46,6 @@ gnome-base/gvfs mtp
 # Needs net-libs/webkit-gtk which is not stable, bug #663248
 app-editors/emacs xwidgets
 
-# Mikle Kolyada <zlogene@gentoo.org> (2018-07-16)
-# No stable qtnetwork
-net-irc/znc test
-
 # Akinori Hattori <hattya@gentoo.org> (2018-06-23)
 # No stable Java
 dev-db/qdbm java
@@ -83,10 +90,6 @@ media-libs/libbluray java
 # Requires app-emulation/xen-tools which is not stable on arm
 app-metrics/collectd collectd_plugins_java collectd_plugins_xencpu
 
-# Michael Palimaka <kensington@gentoo.org> (2017-03-19)
-# Required media-plugins/gst-plugins-x264 is not stable
-media-plugins/gst-plugins-meta x264
-
 # Michael Weber <xmw@gentoo.org> (2017-03-01)
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index e19b0240a5fd..e31a1ee7d7ff 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -33,10 +33,6 @@ acpi
 # net-wireless/wimax not tested
 wimax
 
-# Markus Meier <maekke@gentoo.org> (2010-08-21)
-# app-antivirus/clamav not tested
-clamav
-
 # Kacper Kowalik <xarthisius@gentoo.org> (2010-08-09)
 # cblas-external as virtual/cblas is also masked
 cblas-external
@@ -49,10 +45,6 @@ xfs
 # Fails to build/work
 openexr
 
-# Samuli Suominen <drac@gentoo.org>
-# media-gfx/gimp not tested.
-gimp
-
 # No hardware to test by the team
 ios
 ipod
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 4060fc294115..965bf85ebb41 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,13 +4,17 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# media-gfx/gimp not yet stable
+gimp
+
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not yet stable.
 appindicator
 ayatana
 
 # Mike Gilbert <floppym@gentoo.org> (2017-06-08)
-# dev-lang/python:3.7 is not stable.
+# dev-lang/python:3.8 is not stable.
 python_targets_python3_8
 python_single_target_python3_8
 
diff --git a/profiles/package.mask b/profiles/package.mask
index b208560d6222..9ed842992fe6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Stephan Hartmann <stha09@googlemail.com> (2020-06-29)
+# Dev channel releases are only for people who
+# are developers or want more experimental features
+# and accept a more unstable release.
+>=www-client/chromium-85
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-29)
+# Unmaintained in Gentoo.  Multiple unresolved vulnerabilities.
+# Suggested replacement: sys-apps/portage (just kidding).
+# Removal in 30 days.  Bug #711134.
+sys-apps/pacman
+
 # Aaron Bauman <bman@gentoo.org> (2020-06-28)
 # More Py2 only stuff. Plz see -dev ML for discussions
 # Remove bindings, port to Py3, etc
@@ -40,6 +52,7 @@ app-arch/deltarpm
 app-crypt/virtualsmartcard
 app-text/duali
 app-text/duali-data
+app-dicts/duali-data
 app-text/mftrace
 app-text/queequeg
 app-text/referencer
@@ -48,7 +61,6 @@ dev-libs/tut
 dev-python/elib-intl
 dev-python/eunuchs
 dev-python/medusa
-dev-python/misaka
 dev-python/python-iwscan
 dev-util/confix
 dev-util/qmtest
@@ -60,7 +72,6 @@ net-dns/maradns
 net-irc/irker
 net-mail/archivemail
 net-mail/getmail
-net-nds/nsscache
 net-wireless/airpwn
 sci-chemistry/bkchem
 sci-chemistry/propka
@@ -68,7 +79,6 @@ sci-chemistry/pymol-plugins-bni-tools
 sci-chemistry/pymol-plugins-emovie
 sci-chemistry/viewmol
 sci-libs/chemkit
-sys-apps/x86info
 www-misc/surl
 x11-wm/plwm
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0ed09c29ba3b..438d8c79f6a4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6728,6 +6728,7 @@ net-nds/389-ds-base:pam-passthru - Enable pam-passthru plugin - for simple and f
 net-nds/389-ds-base:presence - Enable presence plugin - non-standard syntax validation
 net-nds/ldapvi:gnutls - Use net-libs/gnutls instead of dev-libs/openssl
 net-nds/nsscache:nsscache - Depend on sys-auth/libnss-cache to handle flat files
+net-nds/nsscache:s3 - Support for S3-based NSS sources
 net-nds/openldap:experimental - Enable experimental backend options
 net-nds/openldap:kinit - Enable support for kerberos init
 net-nds/openldap:minimal - Build libraries & userspace tools only. Does not install any server code
@@ -8706,6 +8707,7 @@ www-client/chromium:closure-compile - Enable closure type-checking for Chrome's
 www-client/chromium:component-build - Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.
 www-client/chromium:hangouts - Enable support for Google Hangouts features such as screen sharing
 www-client/chromium:headless - Build Ozone only with headless backend, NOT RECOMMENDED for general use.
+www-client/chromium:js-type-check - Enable JavaScript type-checking for Chrome's web technology-based UI. Requires Java.
 www-client/chromium:ozone - Enable Ozone platform abstraction layer with X11 backend.
 www-client/chromium:pic - Disable optimized assembly code that is not PIC friendly
 www-client/chromium:proprietary-codecs - Enable proprietary codecs like H.264, MP3
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 1c39d28d9a92..a52853d6b993 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index b904b64a19d2..a2dea488d4fd 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
 else
 	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	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"
 	S="${WORKDIR}/${PN}-${GITHUB_PV}"
 fi
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d9ab1fab5e1e..f12213a27d1c 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 09c6bc5a759c..e7bc6b930bca 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,3 +1,4 @@
 DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
 DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
 DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
+DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
index a1cbede0ed28..a2872894639d 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
 HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs"
 SRC_URI="
 	https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )
+	vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern -> linux64-genXrdPattern-${P} )
 "
 
 SLOT="0"
@@ -51,12 +51,13 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# https://github.com/OpenChemistry/avogadrolibs/issues/449
 	"${FILESDIR}"/${PN}-1.93.0-fix_AvogadroLibsConfig.patch
+	"${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
 )
 
 src_unpack() {
 	default
 	if use vtk; then
-		cp "${DISTDIR}"/linux64-genXrdPattern "${WORKDIR}/genXrdPattern" || die
+		cp "${DISTDIR}"/linux64-genXrdPattern-${P} "${WORKDIR}/genXrdPattern" || die
 	fi
 }
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a0fdb545ff16..4a2e273723b6 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
index 78a9dca8f4b9..594f51a3a774 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd"
 REQUIRED_USE="^^ ( consolekit elogind systemd )"
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 2274ac0ad6ba..35ecce484413 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,3 +1,3 @@
-DIST haveged-1.9.12.tar.gz 495503 BLAKE2B 1fc775ced82980b4b657cf5626a0a88e1de3471ab06638832ed58da4d74e41f10ba7f95cf2c3e04e4cdf19014b41b8c11f690b74c139a235c8ec1159896552ec SHA512 8165cb45ca25ca3d1f6ee303eca47f28006fb4c221bdaea5b0b09b1a712362a41d340e64102ec468a1c8272c096cb416513e6cc98bc70cfd359bdcd481422c9b
+DIST haveged-1.9.13.tar.gz 495737 BLAKE2B 5a8c154d27ca7dc71e7d34051a5e24ec2bd49be7a68175c351293958261083f2cfb0b318daaf005cc95f6a9b76664df63d4c41d28d4276f6906081d21097475a SHA512 dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
diff --git a/sys-apps/haveged/haveged-1.9.12.ebuild b/sys-apps/haveged/haveged-1.9.13.ebuild
similarity index 100%
rename from sys-apps/haveged/haveged-1.9.12.ebuild
rename to sys-apps/haveged/haveged-1.9.13.ebuild
diff --git a/sys-apps/iucode_tool/Manifest b/sys-apps/iucode_tool/Manifest
index 5b55db13dccf..4ce842e55d0e 100644
--- a/sys-apps/iucode_tool/Manifest
+++ b/sys-apps/iucode_tool/Manifest
@@ -1,5 +1 @@
-DIST iucode-tool_2.1.1.tar.xz 143204 BLAKE2B a7f24e76a30d0325c73cc6f6835dc20330e64f409dead85dfe42d676298ebc87b90b21749423a6f90864a5482bb77f0467c229f1c7022513a55fe1ad78676ce5 SHA512 07ebf1919a997e7270d9c53f0287f53975253eb53e678f30bfc55acefc6fba7a51c6a4edbdcdbba88a7643ecbcba6acd0c93847d6d1648659789af37c9c59cd7
-DIST iucode-tool_2.1.2.tar.xz 143352 BLAKE2B 4556403d1a25b1230e8a83532aa33a1d808578a542bc864b814d271b97781cc402684509a72caf165daa99c4964104636fb5f2f68f49dcb1c8d44208f2f8da03 SHA512 f1af71843160500fb9c0b56bffdb1d3db09acf42f6c0a84a5d5311eedfe809f9ac27f89bf1778cab8261d3a540cfe62f3698a45c76be76e7f40179b9c49050e0
-DIST iucode-tool_2.2.tar.xz 149896 BLAKE2B c8289541b5a1550e4eaca2dc347cfd78f04cc723c9e7ca995feb1bd8ef8130db1c595613f66ffa22487fefe20a45e51268d989cc24694e6cc1a07012a564ac68 SHA512 edb5969c1e00480e537cddc49d7cbb190ce70e6f0c44d9c40a481038bfa048fade1b454a7f4eef3048cc204ee303758fe76222f9c9fb9b407ed463ee0ccdd429
 DIST iucode-tool_2.3.1.tar.xz 153380 BLAKE2B 30dfc28e1dd4e0241cb7cfeb18bba746bb85c341a1627e21a5db4965271c26fcfe33f036c2008207bc9fa6c2f32bf2b857e78c9bf23739817d5c5c487d6010cb SHA512 2c7f72eaf509f9daa482ec5f8eb86a45ac9fa84fa856678fdf9ad056e19532e3734e04656d9dbebbd3a774d69f4c861c1340bbe67b1c6c60d61135705980e7d6
-DIST iucode-tool_2.3.tar.xz 153220 BLAKE2B 4d4fddd1c479172a2bc13c4f45a9be13caf66c5ea396fe7b91df29f5ab12e8d07df0bf5d994c23fe5e9001e585a018549e210ac4669d3bcbde7913adc8aab54d SHA512 8cdbc2970d964c11e9178ef38897f88aaf770b70ad5bd4d91fa6164665b1a4e8be7aa2a4b3d7781e55c298ed9e46be0f278ffc1010feee0bd4745486edfa87fc
diff --git a/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild b/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild
deleted file mode 100644
index dcfaa908e494..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.2.ebuild b/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
deleted file mode 100644
index dcfaa908e494..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
similarity index 88%
rename from sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild
rename to sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
index b3d85fc2e5da..cdaff636c174 100644
--- a/sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild
+++ b/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
 HOMEPAGE="https://gitlab.com/iucode-tool/"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild
deleted file mode 100644
index 7800c285d171..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.3.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.ebuild
deleted file mode 100644
index c7682ec00783..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index 00b2ddfd8773..e1a8d6c1067c 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	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"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index bcc650214b00..109f35371edd 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1 +1 @@
-DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
+DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
diff --git a/sys-apps/x86info/files/1.21-pic.patch b/sys-apps/x86info/files/1.21-pic.patch
deleted file mode 100644
index 7bf89240c2c0..000000000000
--- a/sys-apps/x86info/files/1.21-pic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/bench/benchmarks.c
-+++ b/bench/benchmarks.c
-@@ -19,7 +19,10 @@
- #ifdef __linux__
- 	TIME(asm volatile("int $0x80" :"=a" (tmp) :"0" (__NR_getppid)), "int 0x80");
- #endif
--	TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
-+ 	TIME(asm volatile("movl %%ebx,%%edi\n"
-+ 	                  "cpuid\n"
-+ 	                  "movl %%edi,%%ebx\n"
-+ 	                  : : :"%eax", "%edx", "%ecx", "%edi"), "cpuid");
- 
- 	TIME(asm volatile("addl $1,0(%esp)"), "addl");
- 	TIME(asm volatile("lock ; addl $1,0(%esp)"), "locked add");
diff --git a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
deleted file mode 100644
index a9cec0397fac..000000000000
--- a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,8 @@
- LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h
- 
- %.h: %.regs scripts/createheader.py
--	python scripts/createheader.py $< `basename $< .regs` >$@
-+	$(PYTHON) scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
-+	mv $@.tmp $@
- 
- LSMSR_SRC = \
- 	lsmsr.c \
diff --git a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
deleted file mode 100644
index 21034d99edc5..000000000000
--- a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,5 @@
- VERSION=1.30
- 
--CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
--LDFLAGS = -Wl,-z,relro,-z,now
--CC = gcc
--
- SHELL = /bin/sh
- 
- all: x86info test lsmsr
diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch
new file mode 100644
index 000000000000..9e1768d68958
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -0,0 +1,72 @@
+--- a/lsmsr/Makefile
++++ b/lsmsr/Makefile
+@@ -40,7 +40,8 @@
+ 	generic_msr.h
+ 
+ %.h: %.regs createheader.py
+-	@python createheader.py $< `basename $< .regs` >$@
++	$(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
++	mv $@.tmp $@
+ 
+ LSMSR_SRC = \
+ 	lsmsr.c \
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ 
+ CFLAGS = -DVERSION="$(VERSION)"
+ 
+-CFLAGS += -Wall -W -g -O2 -D_FORTIFY_SOURCE=2 -I. -Iinclude
++CFLAGS += -Wall -W -I. -Iinclude
+ ifneq ($(SYSROOT),)
+ CFLAGS += --sysroot=$(SYSROOT)
+ endif
+@@ -18,7 +18,7 @@
+ CFLAGS += -Wswitch-enum
+ CFLAGS += -Wundef
+ CFLAGS += -Wwrite-strings
+-CFLAGS += $(shell pkg-config --cflags libpci)
++CFLAGS += $(shell $$PKG_CONFIG --cflags libpci)
+ 
+ # gcc specific
+ ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1)
+@@ -33,20 +33,8 @@
+ CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)
+ CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2)
+ DEVEL   := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l)
+-CFLAGS  += $(shell if [ $(CPP_MAJOR) -eq 6 -a $(CPP_MINOR) -ge 3 -a $(DEVEL) -eq 1 ] ; then echo "-Werror"; else echo ""; fi)
+ 
+-LDFLAGS = -Wl,-z,relro,-z,now
+-LDFLAGS += $(shell pkg-config --libs libpci)
+-
+-ifeq ($(CC),"")
+-CC = gcc
+-endif
+-
+-ifdef STATIC_LIBPCI
+-LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz
+-else
+-LIBPCI = -lpci
+-endif
++LIBS += $(shell $$PKG_CONFIG --libs libpci)
+ 
+ SHELL = /bin/sh
+ 
+@@ -68,15 +56,14 @@
+ 	$(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c)))
+ 
+ x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS)
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \
+-	    $(LIBPCI)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) $(LIBS)
+ 
+ DEPDIR= .deps
+ -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d)
+ df = $(DEPDIR)/$(*D)/$(*F)
+ 
+ %.o : %.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+ 	@mkdir -p $(DEPDIR)/$(*D)
+ 	@$(CC) -MM $(CFLAGS) $*.c > $(df).d
+ 	@mv -f $(df).d $(df).d.tmp
diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.30-pic.patch
similarity index 81%
rename from sys-apps/x86info/files/x86info-1.24-pic.patch
rename to sys-apps/x86info/files/x86info-1.30-pic.patch
index b4098c5c68c2..6288846b48b7 100644
--- a/sys-apps/x86info/files/x86info-1.24-pic.patch
+++ b/sys-apps/x86info/files/x86info-1.30-pic.patch
@@ -1,10 +1,8 @@
-http://bugs.gentoo.org/270388
-
 --- a/cpuid.c
 +++ b/cpuid.c
-@@ -62,12 +62,28 @@
- 		sched_setaffinity(getpid(), sizeof(set), &set);
- 	}
+@@ -25,12 +25,28 @@
+ 
+ 	bind_cpu(cpunr);
  
 +#ifdef __PIC__
 +	/* GCC on i386 bitches if you clobber ebx.  So hide it behind
diff --git a/sys-apps/x86info/x86info-1.30.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
similarity index 53%
rename from sys-apps/x86info/x86info-1.30.ebuild
rename to sys-apps/x86info/x86info-1.30_p20190617.ebuild
index 358f453ebbbe..e19af2dd09ea 100644
--- a/sys-apps/x86info/x86info-1.30.ebuild
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
 
 DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
 HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
-SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
+# Upstream stopped versioned releases entirely
+COMMIT="8ea5ed19fae1d209eba9257171a10f7afd474618"
+SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
+KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="sys-apps/pciutils:="
-DEPEND="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
-	${RDEPEND}"
+	virtual/pkgconfig"
 
 CONFIG_CHECK="~MTRR ~X86_CPUID"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 PATCHES=(
-	"${FILESDIR}"/1.21-pic.patch
-	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
-	"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
-	"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.30-pic.patch #270388
+	"${FILESDIR}"/${PN}-1.30-makefile.patch
 )
 
 pkg_setup() {
@@ -41,32 +42,30 @@ src_configure() {
 		-Wdeclaration-after-statement -Wredundant-decls
 	append-ldflags -Wl,-z,relro,-z,now
 
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
 
 src_compile() {
-	emake x86info lsmsr
+	emake x86info
 }
 
 src_install() {
-	dobin x86info lsmsr
+	dobin x86info
 
 	insinto /etc/modprobe.d
 	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
 
 	einstalldocs
-	doman x86info.1 lsmsr.8
-
-	dodoc -r results
+	doman x86info.1
 }
 
 pkg_preinst() {
-	if [[ -a "${EROOT%/}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info ]]; then
+	if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
 		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
-		mv "${EROOT%/}"/etc/{modules,modprobe}.d/x86info
+		mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
 	fi
-	if [[ -a "${EROOT%/}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info.conf ]]; then
+	if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
 		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
-		mv "${EROOT%/}"/etc/modprobe.d/x86info{,.conf}
+		mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
 	fi
 }
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 31f11ad49db8..59a7a1f38c90 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/mbuffer/mbuffer-20191016.ebuild b/sys-block/mbuffer/mbuffer-20191016.ebuild
index 6b311595af38..a1a48e24a58a 100644
--- a/sys-block/mbuffer/mbuffer-20191016.ebuild
+++ b/sys-block/mbuffer/mbuffer-20191016.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="debug ssl test"
 
 REQUIRED_USE="test? ( ssl )"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f0c7f1355299..d145dcfdac3c 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/galera/galera-26.4.4.ebuild b/sys-cluster/galera/galera-26.4.4.ebuild
index 24b7eee54002..32400de86ef0 100644
--- a/sys-cluster/galera/galera-26.4.4.ebuild
+++ b/sys-cluster/galera/galera-26.4.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index f71da88333b0..80943a6f2695 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,8 +1,6 @@
-DIST heat.conf.sample-13.0.0 75054 BLAKE2B 294313cc94bea784536030f7b4cd6b87d8b1624cf842ad98c47451541745d0d0874cccd8167362722b18d9f6cd000dc42ff512ff97a9f40dd31985327a27dbc2 SHA512 53f7c8be06006f81316468144376cb8b6fefcd4d149609735ce491e677d2aca88337801598f2366f2b279d52e4c2f7a8422ec7fd0b8aae0ef21dd70553a289ec
 DIST heat.conf.sample-13.0.2 75054 BLAKE2B 294313cc94bea784536030f7b4cd6b87d8b1624cf842ad98c47451541745d0d0874cccd8167362722b18d9f6cd000dc42ff512ff97a9f40dd31985327a27dbc2 SHA512 53f7c8be06006f81316468144376cb8b6fefcd4d149609735ce491e677d2aca88337801598f2366f2b279d52e4c2f7a8422ec7fd0b8aae0ef21dd70553a289ec
 DIST heat.conf.sample-14.0.0 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST heat.conf.sample-2019.2.9999 75054 BLAKE2B 294313cc94bea784536030f7b4cd6b87d8b1624cf842ad98c47451541745d0d0874cccd8167362722b18d9f6cd000dc42ff512ff97a9f40dd31985327a27dbc2 SHA512 53f7c8be06006f81316468144376cb8b6fefcd4d149609735ce491e677d2aca88337801598f2366f2b279d52e4c2f7a8422ec7fd0b8aae0ef21dd70553a289ec
 DIST heat.conf.sample-2020.1.9999 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
-DIST openstack-heat-13.0.0.tar.gz 2342125 BLAKE2B 1fe46924ff491301f69d91979e3e1be9297a4b499e1dbf5004b1e37633afee1167fcd5e8bb79a2b87d7cf54c50ba9accfa6f3a56874555a3640e22ad69ccb4dc SHA512 b122cb864982730fa3ae5db0b41aa4f9cc0d2cf93c439595c85ed5946cdb25483b30d9dfaf066f4450d5cb4a9613b5527810dd2535f9090e568c5eb63c6e60a4
 DIST openstack-heat-13.0.2.tar.gz 2345823 BLAKE2B 2e0610bd9b74e0b39130b478f92b6198a2eb27000b0cadcdee2e14eddf88c520cd50da75914ac562104da4784fe02e767b5d01549b5402bfc2e41dfe8911325f SHA512 6388a0c3b5d8f457281b6185f80a2c4108f4956d268ddc9613b98d14239e5e6b0bbe3fe16459472a289abb9d2af245aca037ee09ad31e3abf8597e081a953527
 DIST openstack-heat-14.0.0.tar.gz 2393821 BLAKE2B 93d4728166496213447571afe9745d217431c1871ee415d413ff96e940c7fe0e9e7d97512cec8dc864564796ac15dd8c5f16e62ecabd6603939074ebba81612a SHA512 973818f33d24d057ce84c8826f50516566ae47386e9559ea2124d5c68f7cfbdf53390bcc7786e1cd29482c3f63ecfee2a10c01bb542fa59141f36cf52b0a5ec3
diff --git a/sys-cluster/heat/heat-13.0.0.ebuild b/sys-cluster/heat/heat-13.0.0.ebuild
deleted file mode 100644
index 5fdc092f0f52..000000000000
--- a/sys-cluster/heat/heat-13.0.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/train"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-S="${WORKDIR}/openstack-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-blazarclient-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	!~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-octaviaclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-	rm -r "${ED}"/usr/etc
-}
diff --git a/sys-cluster/heat/heat-13.0.2.ebuild b/sys-cluster/heat/heat-13.0.2.ebuild
index 5ed1877bf95b..09fc9380c97a 100644
--- a/sys-cluster/heat/heat-13.0.2.ebuild
+++ b/sys-cluster/heat/heat-13.0.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-${PV}
 		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 816a14833b34..2c0e8901fa8c 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils-config/binutils-config-5.3.1.ebuild b/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
index 5f9cd23da4a1..4bb199ff6c43 100644
--- a/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Utility to change the binutils version being used"
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 5339aef9511b..59d2537eefa2 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,4 +1,5 @@
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/clang-common/clang-common-10.0.0.ebuild b/sys-devel/clang-common/clang-common-10.0.0.ebuild
index 6b079c42a2cc..6589ec8ee118 100644
--- a/sys-devel/clang-common/clang-common-10.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-common/clang-common-10.0.1_rc2.ebuild b/sys-devel/clang-common/clang-common-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..18e41e0917da
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-10.0.1_rc2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
index b2858aa38746..d4fd464129cc 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.1_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..65e66879ab98
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.1_rc2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 2c327068f14b..a64a0b278aa3 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,4 +6,5 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/clang/clang-10.0.0.ebuild b/sys-devel/clang/clang-10.0.0.ebuild
index aae5ad123f05..a63fa6015ce5 100644
--- a/sys-devel/clang/clang-10.0.0.ebuild
+++ b/sys-devel/clang/clang-10.0.0.ebuild
@@ -34,7 +34,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -234,6 +234,10 @@ multilib_src_configure() {
 		)
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
diff --git a/sys-devel/clang/clang-10.0.1.9999.ebuild b/sys-devel/clang/clang-10.0.1.9999.ebuild
index 2b8d5fee0580..944ffa67b3da 100644
--- a/sys-devel/clang/clang-10.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.1.9999.ebuild
@@ -289,6 +289,10 @@ multilib_src_configure() {
 		)
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake_src_configure
diff --git a/sys-devel/clang/clang-10.0.1_rc1.ebuild b/sys-devel/clang/clang-10.0.1_rc1.ebuild
index db3798d217bd..ec2222153574 100644
--- a/sys-devel/clang/clang-10.0.1_rc1.ebuild
+++ b/sys-devel/clang/clang-10.0.1_rc1.ebuild
@@ -289,6 +289,10 @@ multilib_src_configure() {
 		)
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake_src_configure
diff --git a/sys-devel/clang/clang-10.0.1_rc2.ebuild b/sys-devel/clang/clang-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..ec2222153574
--- /dev/null
+++ b/sys-devel/clang/clang-10.0.1_rc2.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
+	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/sphinx
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+PATCHES=(
+	# fix simultaneous linking to .a and dylib
+	"${FILESDIR}"/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
+	"${FILESDIR}"/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch
+)
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	mv ../clang-tools-extra tools/extra || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-import-test
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+
+			# manpages
+			docs-clang-man
+			docs-clang-tools-man
+		)
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=ON
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_SPHINX=ON
+			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild
index 5991c42d4c69..76cb2b8d998e 100644
--- a/sys-devel/clang/clang-11.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-11.0.0.9999.ebuild
@@ -284,6 +284,10 @@ multilib_src_configure() {
 		)
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake_src_configure
diff --git a/sys-devel/gcc-config/gcc-config-2.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.ebuild
index e2c270403dd3..c3c357a93446 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 269d9c226c9e..0f7e907ba6fc 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,4 +2,5 @@ DIST lld-8.0.1.src.tar.xz 996440 BLAKE2B 9e205427f5534a69b665620b5ecf6713194421a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/lld/lld-10.0.0.ebuild b/sys-devel/lld/lld-10.0.0.ebuild
index 13345ccde36f..30385d26a883 100644
--- a/sys-devel/lld/lld-10.0.0.ebuild
+++ b/sys-devel/lld/lld-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-10.0.1_rc2.ebuild b/sys-devel/lld/lld-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..7b627c88cf1b
--- /dev/null
+++ b/sys-devel/lld/lld-10.0.1_rc2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
+
+src_install() {
+	cmake_src_install
+	# LLD has no shared libraries, so strip it all for the time being
+	rm -r "${ED}"/usr/{include,lib*} || die
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index dd49441bc78c..674b5f2e930a 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
index 19901996d6d4..875b7c962f97 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-10.0.1_rc2.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..df9cf92b47a1
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-10.0.1_rc2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 89ab271e2349..9370f9240c73 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -4,4 +4,5 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/llvm/llvm-10.0.0.ebuild b/sys-devel/llvm/llvm-10.0.0.ebuild
index c36aefaa55f3..d5dfa7b4da31 100644
--- a/sys-devel/llvm/llvm-10.0.0.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.ebuild
@@ -31,7 +31,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
@@ -344,6 +344,10 @@ multilib_src_configure() {
 		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake-utils_src_configure
diff --git a/sys-devel/llvm/llvm-10.0.1.9999.ebuild b/sys-devel/llvm/llvm-10.0.1.9999.ebuild
index 6bf2a545f962..0cbd220d5637 100644
--- a/sys-devel/llvm/llvm-10.0.1.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.1.9999.ebuild
@@ -432,6 +432,10 @@ multilib_src_configure() {
 		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake_src_configure
diff --git a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
index 5ac7c6e2a8c3..bc805c1b4d35 100644
--- a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
+++ b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
@@ -397,6 +397,10 @@ multilib_src_configure() {
 		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake_src_configure
diff --git a/sys-devel/llvm/llvm-10.0.1_rc2.ebuild b/sys-devel/llvm/llvm-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..bc805c1b4d35
--- /dev/null
+++ b/sys-devel/llvm/llvm-10.0.1_rc2.ebuild
@@ -0,0 +1,477 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? (
+		|| (
+			>=sys-devel/binutils-2.31.1-r4:*[plugins]
+			<sys-devel/binutils-2.31.1-r4:*[cxx]
+		)
+	)
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	libffi? ( virtual/pkgconfig )
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] )
+	')"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+PATCHES=(
+	# Fix linking to dylib and .a libs simultaneously
+	"${FILESDIR}"/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch
+	"${FILESDIR}"/10.0.1/0002-llvm-Disable-linking-llvm-exegesis-to-dylib.patch
+)
+
+python_check_deps() {
+	if use doc; then
+		has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
+			return 1
+	fi
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# manpages don't use markdown
+	if ! use doc; then
+		sed -i -e '/source_parsers/d' docs/conf.py || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-elfabi
+			llvm-exegesis
+			llvm-extract
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-lib
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-pdbutil
+			llvm-profdata
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-undname
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+
+			# manpages
+			docs-dsymutil-man
+			docs-llvm-dwarfdump-man
+			docs-llvm-man
+		)
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=ON
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
index e005e516f322..08addcf459df 100644
--- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
@@ -183,7 +183,9 @@ src_prepare() {
 
 	# manpages don't use markdown
 	if ! use doc; then
-		sed -i -e '/source_parsers/d' docs/conf.py || die
+		sed -e "s:, 'recommonmark'::" \
+			-e '/markdown/d' \
+			-i docs/conf.py || die
 	fi
 
 	# Verify that the live ebuild is up-to-date
@@ -428,6 +430,10 @@ multilib_src_configure() {
 		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
 	fi
 
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 	cmake_src_configure
diff --git a/sys-devel/llvmgold/llvmgold-10.ebuild b/sys-devel/llvmgold/llvmgold-10.ebuild
index 21a246428c6f..e47e2970481d 100644
--- a/sys-devel/llvmgold/llvmgold-10.ebuild
+++ b/sys-devel/llvmgold/llvmgold-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index f4c5bea6c866..9eabb7c82092 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/intel-microcode/intel-microcode-20200616_p20200617.ebuild b/sys-firmware/intel-microcode/intel-microcode-20200616_p20200617.ebuild
index 8beb82b50b74..d20d0f472faa 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20200616_p20200617.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20200616_p20200617.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="hostonly initramfs +split-ucode vanilla"
 REQUIRED_USE="|| ( initramfs split-ucode )"
 
-BDEPEND="sys-apps/iucode_tool"
+BDEPEND=">=sys-apps/iucode_tool-2.3"
 
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="hostonly? ( sys-apps/iucode_tool )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 65157b3445ea..bb4f3ddc41f5 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild
index 42e5fbcdaa67..53056ca18693 100644
--- a/sys-fs/lsscsi/lsscsi-0.31.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.31.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 88c4ea492344..bbd3eae069b1 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 8a75f05d9bd8..1de60f33b9dd 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -7,7 +7,7 @@ DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a617
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
-DIST dropbear-2020.79.tar.bz2 2290687 BLAKE2B 9035f28cbf8d27f18f8f9b80100f9cd3f59bb22c0276941228eb8128c3443216f0eb8fcb9fdfba87c073ed9d3e835d5df0df60213ef2b2fcfa02dbc2db7be7b4 SHA512 e723dd330c6599b49156074662bd2cab4fc26129a43d2ad814475967037ca96aa29332fa9110953829c249a44b535c08345ef15efc7c6a246235a2db9db7ef71
+DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
diff --git a/sys-kernel/genkernel/genkernel-4.0.9.ebuild b/sys-kernel/genkernel/genkernel-4.0.9-r1.ebuild
similarity index 98%
rename from sys-kernel/genkernel/genkernel-4.0.9.ebuild
rename to sys-kernel/genkernel/genkernel-4.0.9-r1.ebuild
index 712a584953d0..bc8eae889349 100644
--- a/sys-kernel/genkernel/genkernel-4.0.9.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.9-r1.ebuild
@@ -16,7 +16,7 @@ VERSION_BUSYBOX="1.31.1"
 VERSION_COREUTILS="8.32"
 VERSION_CRYPTSETUP="2.3.3"
 VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.79"
+VERSION_DROPBEAR="2020.80"
 VERSION_EXPAT="2.2.9"
 VERSION_E2FSPROGS="1.45.6"
 VERSION_FUSE="2.9.9"
@@ -46,7 +46,7 @@ COMMON_URI="
 	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
 	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
 	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2
 	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
 	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
 	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 2420686a696c..8aa97aeb144d 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -16,7 +16,7 @@ VERSION_BUSYBOX="1.31.1"
 VERSION_COREUTILS="8.32"
 VERSION_CRYPTSETUP="2.3.3"
 VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.79"
+VERSION_DROPBEAR="2020.80"
 VERSION_EXPAT="2.2.9"
 VERSION_E2FSPROGS="1.45.6"
 VERSION_FUSE="2.9.9"
@@ -46,7 +46,7 @@ COMMON_URI="
 	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
 	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
 	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2
 	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
 	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
 	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 34577aeed081..6880a8a8e0fe 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index e4e1702e7aca..7bf923da4c52 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -2,4 +2,5 @@ DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea267
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
index 9acd31992957..94b1abe37b20 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..006db04567ad
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
+# FIXME: libfuzzer does not enable all its necessary dependencies
+REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT} )
+	${PYTHON_DEPS}"
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index d950631218aa..9456ddc008b5 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,4 +1,5 @@
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
index ff0cc33bd948..f238f8a5a4b8 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..c83c56ecf249
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+	${PYTHON_DEPS}"
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index f757a14093f7..ad88880fa227 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,4 +1,5 @@
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/libcxx/libcxx-10.0.0.ebuild b/sys-libs/libcxx/libcxx-10.0.0.ebuild
index 20a1d2faae62..28d80ab3f631 100644
--- a/sys-libs/libcxx/libcxx-10.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxx/libcxx-10.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..f96a537e3541
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-10.0.1_rc2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+LLVM_COMPONENTS=( libcxx )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+DOCS=( CREDITS.TXT )
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+src_prepare() {
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+
+	llvm.org_src_prepare
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-libcxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index c759ec851a58..965df08967d8 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,4 +2,5 @@ DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389a
 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
index b80a28332b6c..2ecc31cb4a44 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..41a864c31acd
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind +static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-libcxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 9eb1bf24f0d2..1e128134cd00 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,4 +1,5 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
diff --git a/sys-libs/libomp/libomp-10.0.0.ebuild b/sys-libs/libomp/libomp-10.0.0.ebuild
index 81493f7f5dc9..11b2e0535d25 100644
--- a/sys-libs/libomp/libomp-10.0.0.ebuild
+++ b/sys-libs/libomp/libomp-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/libomp-10.0.1_rc2.ebuild b/sys-libs/libomp/libomp-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..5bffd6685f64
--- /dev/null
+++ b/sys-libs/libomp/libomp-10.0.1_rc2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 4acc2d22c7ca..96ec320d1035 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -3,4 +3,5 @@ DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39b
 DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
index f72fa83f9168..c8d1dbb91a24 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..711bac7d068f
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+build_libcxxabi() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	build_libcxxabi
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 3ca1ead1f468..08d5e1f2ab77 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/tuxedo-cc-wmi/Manifest b/sys-power/tuxedo-cc-wmi/Manifest
new file mode 100644
index 000000000000..1cbeb56e540a
--- /dev/null
+++ b/sys-power/tuxedo-cc-wmi/Manifest
@@ -0,0 +1 @@
+DIST tuxedo-cc-wmi-0.1.4.tar.gz 25089 BLAKE2B f71eedeb02a301caf27ef12326cc9c163631788c5b991e980e78b618ff767ab4c0f6a609ebffefb3afa830b781e6043bdb85b9e4659927838c280d0aaa3b300c SHA512 a41faa7290859410eb8446dd02ee2bdf87a3085882f3fc6b968701bb14bab87bd6bcd4bf9839111c62eab8a8751f8c2cf378aa7297879f7781f73998199e5f27
diff --git a/sys-power/tuxedo-cc-wmi/metadata.xml b/sys-power/tuxedo-cc-wmi/metadata.xml
new file mode 100644
index 000000000000..e42604230c16
--- /dev/null
+++ b/sys-power/tuxedo-cc-wmi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mschiff@gentoo.org</email>
+    <name>Marc Schiffbauer</name>
+  </maintainer>
+</pkgmetadata>
+
diff --git a/sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4.ebuild b/sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4.ebuild
new file mode 100644
index 000000000000..990f9c91e1e5
--- /dev/null
+++ b/sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel Module for Tuxedo WMI"
+HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-cc-wmi"
+SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BUILD_TARGETS="all"
+MODULE_NAMES="tuxedo_cc_wmi(tuxedo:${S}:src)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index f584b6dde290..e127e3a72291 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/lsof/lsof-4.93.2-r1.ebuild b/sys-process/lsof/lsof-4.93.2-r1.ebuild
index e7b81f284c52..853b476fc840 100644
--- a/sys-process/lsof/lsof-4.93.2-r1.ebuild
+++ b/sys-process/lsof/lsof-4.93.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples ipv6 rpc selinux"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index c9947fcb9cea..22c724e211bd 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
index 9c07a9421472..6c1e6cc23f97 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
index b68ed24ec609..9278ecf3f35a 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~x64-cygwin ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index b5c52c739646..d65ecbdd0962 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 1da720e59564..8f8ace26a52a 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,2 +1,3 @@
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
 DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
+DIST Nikola-8.1.0.tar.gz 4298799 BLAKE2B 568b6b39506ab78c84bdb5fc1bf66829a714d41e1c88afe40236e915a801ce8214e7913ecfda7816d11af17beb9bdb54a0c60a88ef72ce53f7bdac91d057489d SHA512 b88fdf4848314e6428b7f3c4a891aefe682f1ae6a2cdc8da25de1d6af839f5d6f3410e23d90b76094f082aebe15d7e51b2c9cd079d017960bb979503d62a4b68
diff --git a/www-apps/nikola/nikola-8.1.0.ebuild b/www-apps/nikola/nikola-8.1.0.ebuild
new file mode 100644
index 000000000000..793c3b94805a
--- /dev/null
+++ b/www-apps/nikola/nikola-8.1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setup-py.patch
+)
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
+}
diff --git a/www-apps/radicale/radicale-2.1.11-r1.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
index 881d37248fc7..9f8ebc37c38f 100644
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ b/www-apps/radicale/radicale-2.1.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils user systemd
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a1315325c646..f8efec2a9394 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 d738c1693e39..8f0047fc5b2e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,7 @@
 DIST chromium-83.0.4103.116.tar.xz 802626772 BLAKE2B 6890d8f4a4a9b12ab56a63e037129f6b77f03f95a841494505fdbbe212b0dd756e5558bddd7ee186669929c6069568c76b70b179fe4a58ccad465f2d4677d6e5 SHA512 dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
 DIST chromium-84-patchset-3.tar.xz 20148 BLAKE2B d910570b43f63bcf4ead90ca4e4005a08d7c85b5b4e7af2a70ec4bc18265cbe8b075523878710075cfee4e0631eb3374e1e6d06251f4bf03377954807b1951e9 SHA512 316db8b0359b10a988242a0d665475d912fa9b610a547478d8c39b337afc02780a54d7024e231eb4fd402063cf439f6e2b4bb92a4968c8e0c3e69d84a2ae1664
 DIST chromium-84.0.4147.68.tar.xz 845188784 BLAKE2B a0185a5aacc1297f6240e2d887e980c69ba1219267714fb82c87e2ec31e4a3bee24ea9c059fc4f56dcc5c3e576d0baf5b59ec3576fc266daac583cf2b2917b56 SHA512 c5304dfa76ec9bf1d7e96116b6560b77d636eaa226acf7be46798f4b161c6aba90c54bec797dfbf1e48ece46d4e52e44737ed68457f9b10bbc11658a9020bffd
+DIST chromium-85-patchset-1.tar.xz 9164 BLAKE2B ae52909be374accc0bfa1d9928beb573409de6f6b4f6e1e2cb9f45a7ecdf7a70dcae66f95697a718c2d8271a402b1ce3546c20a85510e219da4d12d3e09419cd SHA512 d04ffd78315710312fbda1161dced731ae23441080ccf3f410b06a22950fa72b6e67f45abe9c9c2a509881191da4ddc4aff391c8cc5c80adfe06c6154ea857d0
+DIST chromium-85.0.4181.8.tar.xz 863049932 BLAKE2B 0a43002498254297ff15e569912b22d5d5b701c1939b92dc544fe2c8c6dbc0190f6afbe3cbe927cd145156ff1b3a9741bd4faf03a37b7aa20f63fec77f899a35 SHA512 7a8141ede000e81346c3ffb62caef1660fed98450eb088a9ba048a7b75a1255c1fc3e5a015e2c0988ad0fd05dc7116d169693465a0d1421c24519d23f7640a98
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
diff --git a/www-client/chromium/chromium-85.0.4181.8.ebuild b/www-client/chromium/chromium-85.0.4181.8.ebuild
new file mode 100644
index 000000000000..14d6fac66e6a
--- /dev/null
+++ b/www-client/chromium/chromium-85.0.4181.8.ebuild
@@ -0,0 +1,866 @@
+# Copyright 2009-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+XCB_PROTO_VERSION="1.14"
+PATCHSET="1"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="
+	component-build? ( !suid )
+	wayland? ( ozone )
+"
+
+COMMON_X_DEPEND="
+	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:=
+"
+
+COMMON_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:=
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	ozone? (
+		!headless? (
+			${COMMON_X_DEPEND}
+			x11-libs/gtk+:3[wayland?,X]
+			wayland? (
+				dev-libs/wayland:=
+				dev-libs/libffi:=
+				x11-libs/libdrm:=
+				x11-libs/libxkbcommon:=
+			)
+		)
+	)
+	!ozone? (
+		>=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]
+		x11-libs/libXScrnSaver:=
+		${COMMON_X_DEPEND}
+	)
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1726
+	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 )
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-9"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-9"
+	DEPEND+=" >=sys-libs/libcxx-9"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-67.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-84-mediaalloc.patch"
+	"${FILESDIR}/chromium-85-ozone-include.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
+		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
+			die "Component build with tcmalloc requires FEATURES=-usersandbox."
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			if use component-build; then
+				die "Component build with clang requires fuzzer headers."
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	eapply "${WORKDIR}/patches"
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/libgifcodec
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/schema_org
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+
+		# we need to generate ppc64 stuff because upstream does not ship it yet
+		# it has to be done before unbundling.
+		if use ppc64; then
+			pushd third_party/libvpx >/dev/null || die
+			mkdir -p source/config/linux/ppc64 || die
+			./generate_gni.sh || die
+			popd >/dev/null || die
+		fi
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+	if use ozone && use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Use bundled xcb-proto, bug #727000
+	myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
+
+	# Enable ozone support
+	if use ozone; then
+		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+		myconf_gn+=" ozone_platform_headless=true"
+		if ! use headless; then
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+			myconf_gn+=" ozone_platform_x11=true"
+			myconf_gn+=" ozone_platform_headless=true"
+			if use wayland; then
+				myconf_gn+=" use_system_minigbm=true use_xkbcommon=true"
+				myconf_gn+=" ozone_platform=\"wayland\""
+			else
+				myconf_gn+=" ozone_platform=\"x11\""
+			fi
+		else
+			myconf_gn+=" ozone_platform=\"headless\""
+		fi
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	# Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${PYTHONPATH+:}${PYTHONPATH}"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	ozone_auto_session () {
+		use ozone && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r4.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so)
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-85-ozone-include.patch b/www-client/chromium/files/chromium-85-ozone-include.patch
new file mode 100644
index 000000000000..2441a2aca135
--- /dev/null
+++ b/www-client/chromium/files/chromium-85-ozone-include.patch
@@ -0,0 +1,24 @@
+From 9abbd7da1ddd8003106cc3420170561d475231a9 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 29 Jun 2020 13:01:27 +0000
+Subject: [PATCH] IWYU: add missing include for std::vector
+
+---
+ ui/ozone/public/platform_screen.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ui/ozone/public/platform_screen.h b/ui/ozone/public/platform_screen.h
+index 9ce293c..ba20597 100644
+--- a/ui/ozone/public/platform_screen.h
++++ b/ui/ozone/public/platform_screen.h
+@@ -7,6 +7,7 @@
+ 
+ #include <set>
+ #include <string>
++#include <vector>
+ 
+ #include "base/component_export.h"
+ #include "base/macros.h"
+-- 
+2.26.2
+
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 4be3cc808730..55475a29fefb 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="closure-compile">Enable closure type-checking for Chrome's web technology-based UI. Requires Java.</flag>
+		<flag name="js-type-check">Enable JavaScript type-checking for Chrome's web technology-based UI. Requires Java.</flag>
 		<flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
 		<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag>
 		<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
diff --git a/www-client/netsurf/netsurf-3.10.ebuild b/www-client/netsurf/netsurf-3.10-r1.ebuild
similarity index 99%
rename from www-client/netsurf/netsurf-3.10.ebuild
rename to www-client/netsurf/netsurf-3.10-r1.ebuild
index 206f8f8d2f65..1ac3219ccb83 100644
--- a/www-client/netsurf/netsurf-3.10.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=net-libs/libdom-0.3
 	>=net-libs/libhubbub-0.3
 	>=dev-libs/libnsutils-0.0.5
-	>=dev-libs/libutf8proc-2.2
+	>=dev-libs/libutf8proc-2.4
 	dev-libs/libxml2:2
 	net-misc/curl
 	bmp? ( >=media-libs/libnsbmp-0.1 )
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 780c01fe5bd9..74b7d9c1c4ca 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,2 +1,3 @@
 DIST opera-developer_70.0.3721.0_amd64.deb 67339908 BLAKE2B 8165e55bb82c9a89581a52d9d887d931d29b0de5763c0320f1bebd930ecfec3057f97796ebf40bfa90897b8d3653989a2dbb8b2c1e88c3f930ab40be61a32f60 SHA512 bf35b6f7e94cf64312592df1764fe85b73a3f84712dcb73a48bd976c1d3a03d9578305170bec7480427e9c9e9db8a84c27f5a20aef98d1a4391fd1295f8881b9
 DIST opera-developer_70.0.3728.0_amd64.deb 67337716 BLAKE2B 408d699664de431777d38873e60fefa298b2e3dce1c1bc51fae5230cd172150753fd260459f3649c5563d34aa5c79ad7f79ba8e3607dc6f533d3e1471c7c7a8f SHA512 b055a320b92888295094d83f609ed6afd256c007fac108d979bf4f54569bebf6c39a7926f0ba44456590b77bf93452356638fc61d8323c0bab42aac7c7d5b2b6
+DIST opera-developer_71.0.3735.0_amd64.deb 67521252 BLAKE2B 0e5df62a5e6a816475931457368bb142a3018a8e526d79d18f2c8246c09ef7daab0b76b53adf0389b8d75de8d82527ca1b71371d27c7ab4e8ed2c4f7ed6767dc SHA512 0c0c0a30fdaa6f2567e3c35d22b64b48b4126d11d422c42c89599b29a839d83c71b48dd4e853c90308e3800d787255fa373e86d088ae4cfc80cc5c0e2d91f91e
diff --git a/www-client/opera-developer/opera-developer-71.0.3735.0.ebuild b/www-client/opera-developer/opera-developer-71.0.3735.0.ebuild
new file mode 100644
index 000000000000..837674712eae
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-71.0.3735.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	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/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+src_prepare() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 39c45ac0bfe3..ad316af8f5d9 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
index f66e31d379fe..94c582830348 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
@@ -70,7 +70,13 @@ REQUIRED_USE="tools? ( X )"
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	DRM_KMS_HELPER
+	~!LOCKDEP
+	~SYSVIPC
+"
 
 pkg_pretend() {
 	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
index 7281442a0609..3f2495a4af14 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
@@ -80,7 +80,13 @@ RDEPEND="
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
 
 pkg_pretend() {
 	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
index fa5a3a20b57f..d042a6ee3ddd 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
@@ -84,7 +84,13 @@ RDEPEND="
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
 
 pkg_pretend() {
 	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
index 8220e219011e..3bf3c71b97c8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -86,9 +86,10 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
+	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
-	~MTRR
+	~DRM_KMS_HELPER
 	~SYSVIPC
 "
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
index d7a98e6ab415..d2aeed7b1691 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
@@ -77,9 +77,10 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
+	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
-	~MTRR
+	~DRM_KMS_HELPER
 	~SYSVIPC
 "
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
index 268a6266f982..a0a7e2f2d5f8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
@@ -81,9 +81,10 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.4"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
+	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
-	~MTRR
+	~DRM_KMS_HELPER
 	~SYSVIPC
 "
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
index 270edf36ba0e..5772b74a7c25 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
@@ -84,9 +84,10 @@ PATCHES=(
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
+	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
-	~MTRR
+	~DRM_KMS_HELPER
 	~SYSVIPC
 "
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
index 0b5de38b4b1e..f6e28fa006f6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
@@ -85,9 +85,10 @@ PATCHES=(
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
+	DRM
+	DRM_KMS_HELPER
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
-	~MTRR
 	~SYSVIPC
 "
 
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 43575c80209d..f50b501e3868 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild
index 47316e0d9b9b..9a806a2d123f 100644
--- a/x11-libs/gtk+/gtk+-3.24.20.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.20.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
index 98ccbdf2868f..cd3521b0b525 100644
--- a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
 
 LICENSE="FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 90ffa05af8b9..493631909bf1 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,2 +1 @@
-DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
 DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
deleted file mode 100644
index f9fd1d423593..000000000000
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV/_/-}"
-inherit multibuild qmake-utils
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6/1.3"
-IUSE="designer doc examples mathml opengl static-libs svg"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	opengl? (
-		dev-qt/qtopengl:5
-		virtual/opengl
-	)
-	svg? ( dev-qt/qtsvg:5 )
-"
-RDEPEND="${DEPEND}
-	!<x11-libs/qwt-5.2.3
-	!x11-libs/qwt:5[doc]
-	doc? ( !<media-libs/coin-3.1.3[doc] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( CHANGES-6.1 README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
-	"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_prepare() {
-	cat > qwtconfig.pri <<-EOF
-		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
-		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
-		VERSION = ${PV/_*}
-		QWT_VERSION = ${PV/_*}
-	EOF
-
-	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
-	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
-	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
-	cat > qwtbuild.pri <<-EOF
-		QWT_CONFIG += qt warn_on thread release no_keywords
-	EOF
-
-	multibuild_copy_sources
-
-	preparation() {
-		if [[ ${MULTIBUILD_VARIANT} == shared ]]; then
-			echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
-		fi
-
-		cat >> qwtconfig.pri <<-EOF
-			QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
-			QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
-		EOF
-		sed \
-			-e 's/target doc/target/' \
-			-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
-			-e "/^TARGET/s:qwt):qwt6-qt5):g" \
-			-i src/src.pro || die
-
-		sed \
-			-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
-			-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
-			-i qwt.prf designer/designer.pro examples/examples.pri \
-			textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-
-		default
-	}
-
-	multibuild_foreach_variant run_in_build_dir preparation
-}
-
-src_configure() {
-	multibuild_foreach_variant run_in_build_dir eqmake5
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
-	testing() {
-		cd examples || die
-		eqmake5 examples.pro
-		emake
-	}
-	multibuild_foreach_variant run_in_build_dir testing
-}
-
-src_install() {
-	rm -f doc/man/*/{_,deprecated}* || die
-
-	multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
-
-	if use mathml; then
-		sed \
-			-e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
-			-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
-	fi
-
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-
-	einstalldocs
-
-	mkdir -p "${ED}"/usr/share/man/ || die
-	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
-		rmdir "${ED}"/usr/share/doc/${PF}/man || die
-
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-			LIBS        += -lqwt6
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}6
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
index 42df258aab5c..170bfa85c870 100644
--- a/x11-libs/qwt/qwt-6.1.4.ebuild
+++ b/x11-libs/qwt/qwt-6.1.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 SLOT="6/1.4"
 IUSE="designer doc examples mathml opengl svg"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 83215ab7d4fa..859b2998530d 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
index e0e0b3da6b06..f6c2b3f3d3a7 100644
--- a/x11-misc/alacarte/alacarte-3.36.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/projecteur/projecteur-0.7-r2.ebuild b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
index 63ce3fd4425e..26072768e67e 100644
--- a/x11-misc/projecteur/projecteur-0.7-r2.ebuild
+++ b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
index 1c1b5f678fce..c2608ef15845 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a9c56d89c0f0..6be0a8bbd809 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/i3/i3-4.18.1.ebuild b/x11-wm/i3/i3-4.18.1.ebuild
index d7064cfb971e..58a3f832182c 100644
--- a/x11-wm/i3/i3-4.18.1.ebuild
+++ b/x11-wm/i3/i3-4.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
index c6e568965e54..1c17f3dbc408 100644
--- a/x11-wm/mutter/mutter-3.34.6-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 5ef8f5f2c7d3..440425eeab29 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
index c0e63b4f939b..73f4ea9adf6c 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+gtk2 introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!gtk2? ( test )"
diff --git a/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild
index 0ff5d0329c2c..4e2578f8bd47 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls policykit +xscreensaver"
 
 COMMON_DEPEND="x11-apps/iceauth
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
index 27e97c54a81b..105d571e27bc 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 
 RDEPEND="
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 880b4f346080..51a67e0f913f 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
index 3bb94fd3d94d..501566b11ff0 100644
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/${PV%.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild
index 6708b2ddc7d7..8904a0c06d63 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="qrcode"
 
 RDEPEND=">=dev-libs/glib-2.32:2=
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.1.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.1.ebuild
index 8af5ce04c386..6f920faa0f6b 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.1.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2 -> ${P}-r
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2=
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
index b5e58098a79b..63ba8af5f624 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="debug keybinder libnotify wnck"
 
 RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
index 7f4a9a2e439b..7420be68772f 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
index 1d5070d62417..a6a2f1033366 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="